Home| summaryrefslogtreecommitdiff |
| author | Olaf Dabrunz <odabrunz@suse.de> | 2007-09-21 17:27:31 (GMT) |
|---|---|---|
| committer | Olaf Dabrunz <odabrunz@suse.de> | 2007-09-21 17:27:31 (GMT) |
| commit | c6ed247858ee76e177548d51480993e3e96e44f7 (patch) (side-by-side diff) | |
| tree | 43d635bd27e175f2c253f9e5d4a0a685c40fdd2b | |
| parent | 76ae12ec6cc216506548bf3e647ae360bf804a57 (diff) | |
- rpm/post.sh: revert last change: during installation and update
from installation system bootloader_entry will use the
delayed-run feature to run after yast2-bootloader has updated the
system configuration -- needed to add entries for multiple
installed kernels (309837)
| -rw-r--r-- | kernel-source.changes | 9 | ||||
| -rw-r--r-- | rpm/post.sh | 14 |
2 files changed, 16 insertions, 7 deletions
diff --git a/kernel-source.changes b/kernel-source.changes index 4c7542b..ce5e76b 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Sep 21 19:21:10 CEST 2007 - od@suse.de + +- rpm/post.sh: revert last change: during installation and update + from installation system bootloader_entry will use the + delayed-run feature to run after yast2-bootloader has updated the + system configuration -- needed to add entries for multiple + installed kernels (309837) + +------------------------------------------------------------------- Thu Sep 20 20:25:45 CEST 2007 - olh@suse.de - drop patches.arch/ppc-atyfb-force-xtal.patch diff --git a/rpm/post.sh b/rpm/post.sh index fa0fcb3..8ea255b 100644 --- a/rpm/post.sh +++ b/rpm/post.sh @@ -66,10 +66,6 @@ run_bootloader () { fi } -# In the middle of a system installation or update some information needed to -# update the bootloader configuration may be missing: do all these updates in a -# later stage. -if [ "$YAST_IS_RUNNING" != instsys ] ; then # Both perl-Bootloader and mkinitrd need valid partitioning # information in /etc/fstab, so only run the scripts in that # case. Also check for /.buildenv because of autobuild and @@ -78,11 +74,18 @@ if [ "$YAST_IS_RUNNING" != instsys ] ; then # /sbin/mkinitrd is always there). if [ -f /etc/fstab -a ! -e /.buildenv -a -x /sbin/mkinitrd ] ; then + # Don't run mkinitrd when we are in the installation system + # because the yast2 bootloader runs at the end of stage + # 1 installation, so this one is useless (and it's also + # problematic if the yast2 storage converts the /etc/fstab + # e.g. from hda to sda device names) + if [ "$YAST_IS_RUNNING" != instsys ] ; then if ! /sbin/mkinitrd -k /boot/@IMAGE@-@KERNELRELEASE@ \ -i /boot/initrd-@KERNELRELEASE@; then echo "/sbin/mkinitrd failed" >&2 exit 1 fi + fi # only run the bootloader if the usual bootloader configuration # files are there -- this is different on every architecture @@ -124,13 +127,10 @@ if [ "$YAST_IS_RUNNING" != instsys ] ; then else message_install_bl fi - else - message_install_bl fi else echo "Please run mkinitrd as soon as your system is complete." message_install_bl fi -fi # vim: set sts=4 sw=4 ts=8 noet: |