Hello community, here is the log from the commit of package perl-Bootloader checked in at Fri Sep 21 19:32:17 CEST 2007. -------- --- perl-Bootloader/perl-Bootloader.changes 2007-09-21 15:35:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2007-09-21 19:20:54.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Sep 21 19:12:35 CEST 2007 - aosthof@suse.de + +- Save command for adding new section(s) (also multiple kernels) in + /boot/perl-BL_delayed_exec for delayed execution in the target + system. This script will be run by yast2-bootloader after the + installation of packages is finished (#309837) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.ybK365/_old 2007-09-21 19:32:03.000000000 +0200 +++ /var/tmp/diff_new_pack.ybK365/_new 2007-09-21 19:32:03.000000000 +0200 @@ -12,7 +12,7 @@ Name: perl-Bootloader Version: 0.4.30 -Release: 1 +Release: 3 Requires: perl >= %{perl_version} Requires: perl-gettext Requires: e2fsprogs @@ -66,6 +66,11 @@ /usr/lib/bootloader %changelog * Fri Sep 21 2007 - aosthof@suse.de +- Save command for adding new section(s) (also multiple kernels) in + /boot/perl-BL_delayed_exec for delayed execution in the target + system. This script will be run by yast2-bootloader after the + installation of packages is finished (#309837) +* Fri Sep 21 2007 - aosthof@suse.de - Save command for removal of old sections in /boot/perl-BL_delayed_exec for delayed execution in the target system, script will be run by yast2-bootloader after installation ++++++ bootloader_entry ++++++ --- perl-Bootloader/bootloader_entry 2007-09-21 15:35:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/bootloader_entry 2007-09-21 19:20:54.000000000 +0200 @@ -73,58 +73,77 @@ { echo "bootloader_entry: This is function add_entry()" >> $logname - # Set up the new kernel - if [ -f /etc/sysconfig/bootloader ] && - [ -f /boot/grub/menu.lst -o \ - -f /etc/lilo.conf -o \ - -f /etc/elilo.conf -o \ - -f /etc/zipl.conf ]; then - case $flavor in - (kdump|um) - ;; - (xen*) - opt_xen_kernel= - set -- $flavor - set -- ${1#xen} - opt_xen_kernel=--xen-kernel=/boot/xen${1:+-$1}.gz - - # Add the new bootloader entry (xen kernel) - update_bootloader --image /boot/$image \ - --initrd /boot/$initrd \ - --default \ - --add \ - --force $opt_xen_kernel \ - --name "$release" - - # Run the bootloader (e.g., lilo). - update_bootloader --refresh - ;; - - (debug) - # Add the new bootloader entry (debug kernel) - update_bootloader --image /boot/$image \ - --initrd /boot/$initrd \ - --add \ - --force \ - --name "$release" - - # Run the bootloader (e.g., lilo). - update_bootloader --refresh - ;; - - (*) - # Add the new bootloader entry - update_bootloader --image /boot/$image \ - --initrd /boot/$initrd \ - --default \ - --add \ - --force \ - --name "$release" - - # Run the bootloader (e.g., lilo). - update_bootloader --refresh - ;; - esac + # If running in instsys, write command(s) to be executed in a file + # which will be executed by yast2-bootloader after installation of + # packages is finished. + # + # This is to prevent inconsistencies triggered by libata migration. + + if [ "$YAST_IS_RUNNING" == instsys -a "$DELAYED_RUN_UPDATE_BOOTLOADER" != yes ]; then + cat - >> $delayed_exec_file <<-EOF + #!/bin/sh + + export DELAYED_RUN_UPDATE_BOOTLOADER=yes + + /usr/lib/bootloader/bootloader_entry $@ + + EOF + + chmod 755 $delayed_exec_file + else + # Set up the new kernel + if [ -f /etc/sysconfig/bootloader ] && + [ -f /boot/grub/menu.lst -o \ + -f /etc/lilo.conf -o \ + -f /etc/elilo.conf -o \ + -f /etc/zipl.conf ]; then + case $flavor in + (kdump|um) + ;; + (xen*) + opt_xen_kernel= + set -- $flavor + set -- ${1#xen} + opt_xen_kernel=--xen-kernel=/boot/xen${1:+-$1}.gz + + # Add the new bootloader entry (xen kernel) + update_bootloader --image /boot/$image \ + --initrd /boot/$initrd \ + --default \ + --add \ + --force $opt_xen_kernel \ + --name "$release" + + # Run the bootloader (e.g., lilo). + update_bootloader --refresh + ;; + + (debug) + # Add the new bootloader entry (debug kernel) + update_bootloader --image /boot/$image \ + --initrd /boot/$initrd \ + --add \ + --force \ + --name "$release" + + # Run the bootloader (e.g., lilo). + update_bootloader --refresh + ;; + + (*) + # Add the new bootloader entry + update_bootloader --image /boot/$image \ + --initrd /boot/$initrd \ + --default \ + --add \ + --force \ + --name "$release" + + # Run the bootloader (e.g., lilo). + update_bootloader --refresh + ;; + esac + fi fi } @@ -140,11 +159,9 @@ # which will be executed by yast2-bootloader after installation of # packages is finished. # - # This is to prevent inconsistencies triggered by libata merge. + # This is to prevent inconsistencies triggered by libata migration. if [ "$YAST_IS_RUNNING" == instsys -a "$DELAYED_RUN_UPDATE_BOOTLOADER" != yes ]; then - delayed_exec_file="/boot/perl-BL_delayed_exec" - cat - >> $delayed_exec_file <<-EOF #!/bin/sh @@ -206,17 +223,34 @@ ( echo "/proc/mounts:" cat /proc/mounts +echo + echo "/sys:" ls -l /sys +echo + +fstab="/etc/fstab" +if [ -e $fstab ] ; then + echo "fstab:" + cat $fstab + echo +fi + echo "excerpts of /dev:" ls -l /dev/{[hs]d[ab]?,md[0-3],.udev} +echo + device_map="/boot/grub/device.map" if [ -e $device_map ] ; then echo "device.map:" cat $device_map + echo fi ) >> $logname +# File containing commands for later execution +delayed_exec_file="/boot/perl-BL_delayed_exec" + # Checks if correct amount of arguments is given if [ "$#" -ne "4" -a "$#" -ne "5" ] ; then usage @@ -229,7 +263,7 @@ case $action in add) # Add a new bootloader entry - add_entry + add_entry "$@" ;; remove) # Remove an existing bootloader entry ++++++ perl-Bootloader-0.4.30.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org