X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fsuse-post.sh;h=7efe83df630f8d4b8781872c73e5a7788bf914a2;hb=a14cd92beb52755dd1115f93288f7f0479f59c12;hp=ec386646e3ed9bfbfa45beecfd296c131ba0e1f3;hpb=87a2010dd6dc319922325739995b4233518328db;p=fs%2Flustre-release.git diff --git a/build/suse-post.sh b/build/suse-post.sh index ec38664..7efe83d 100644 --- a/build/suse-post.sh +++ b/build/suse-post.sh @@ -9,38 +9,74 @@ else exit 0 fi +case %ver_str in + (*xen*|*um*) + NOBOOTSPLASH="-s off" + SHORTNM=%ver_str + SHORTNM=-${SHORTNM##*-} + ;; + (*) + unset NOBOOTSPLASH + unset SHORTNM + ;; +esac + # If we have old symlinks, rename them to *.previous -if [ -L /boot/$image -a -L /boot/initrd -a \ - "$(readlink /boot/$image)" != $image-%ver_str -a \ - "$(readlink /boot/initrd)" != initrd-%ver_str ]; then - mv /boot/$image /boot/$image.previous - mv /boot/initrd /boot/initrd.previous +if [ -L /boot/$image$SHORTNM -a \ + "$(readlink /boot/$image$SHORTNM)" != $image-%ver_str ]; then + mv /boot/$image$SHORTNM /boot/$image$SHORTNM.previous fi - -# update /boot/vmlinuz symlink -relink $image-%ver_str /boot/$image +relink $image-%ver_str /boot/$image$SHORTNM if test "$YAST_IS_RUNNING" != instsys ; then if [ -f /etc/fstab ]; then echo Setting up /lib/modules/%ver_str - /sbin/update-modules.dep -v %ver_str + if [ -x /sbin/update-modules.dep ]; then + /sbin/update-modules.dep -v %ver_str + else + /sbin/depmod -a -F /boot/System.map-%ver_str %ver_str + fi cd /boot - /sbin/mkinitrd -k $image-%ver_str -i initrd-%ver_str + /sbin/mkinitrd -k $image-%ver_str -i initrd-%ver_str $NOBOOTSPLASH + if [ -L /boot/initrd$SHORTNM -a \ + "$(readlink /boot/initrd)" != initrd-%ver_str ]; then + mv /boot/initrd$SHORTNM /boot/initrd$SHORTNM.previous + fi if [ -e /boot/initrd-%ver_str ]; then - relink initrd-%ver_str /boot/initrd + relink initrd-%ver_str /boot/initrd$SHORTNM else - rm -f /boot/initrd + rm -f /boot/initrd$SHORTNM fi else echo "please run mkinitrd as soon as your system is complete" fi fi -if [ "$YAST_IS_RUNNING" != instsys -a -x /sbin/new-kernel-pkg ]; then +if [ "$YAST_IS_RUNNING" != instsys ]; then # Notify boot loader that a new kernel image has been installed. # (during initial installation the boot loader configuration does not # yet exist when the kernel is installed, but yast kicks the boot # loader itself later.) - /sbin/new-kernel-pkg %ver_str + if [ -x /sbin/new-kernel-pkg ]; then + /sbin/new-kernel-pkg %ver_str + elif [ -x /usr/lib/bootloader/bootloader_entry ]; then + # handle 10.2 and SLES10 SP1 + /usr/lib/bootloader/bootloader_entry \ + add \ + %flavor \ + %ver_str \ + vmlinuz-%ver_str \ + initrd-%ver_str + elif [ -x /sbin/update-bootloader ]; then + # handle 10.1 and SLES10 GA + /sbin/update-bootloader \ + --add \ + --image /boot/vmlinuz-%ver_str \ + --initrd /boot/initrd-%ver_str + /sbin/update-bootloader --refresh + else + echo "You may need to setup and install the boot loader using the" + echo "available bootloader for your platform (e.g. grub, lilo, zipl, ...)." + fi fi