Hello community, here is the log from the commit of package perl-Bootloader checked in at Wed Nov 8 14:07:31 CET 2006. -------- --- perl-Bootloader/perl-Bootloader.changes 2006-11-07 16:46:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2006-11-08 13:57:56.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 8 13:57:40 CET 2006 - schwab@suse.de + +- Fix error checking. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.PoyEZo/_old 2006-11-08 14:07:17.000000000 +0100 +++ /var/tmp/diff_new_pack.PoyEZo/_new 2006-11-08 14:07:17.000000000 +0100 @@ -12,7 +12,7 @@ Name: perl-Bootloader Version: 0.4.0 -Release: 1 +Release: 3 Requires: perl >= %{perl_version} Requires: perl-gettext Requires: mdadm e2fsprogs @@ -64,6 +64,8 @@ /usr/lib/bootloader %changelog -n perl-Bootloader +* Wed Nov 08 2006 - schwab@suse.de +- Fix error checking. * Tue Nov 07 2006 - aosthof@suse.de - changed interface of bootloader_entry script to kernel rpm, no more second guessing. ++++++ bootloader_entry ++++++ --- perl-Bootloader/bootloader_entry 2006-11-07 16:37:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Bootloader/bootloader_entry 2006-11-08 13:57:37.000000000 +0100 @@ -28,21 +28,11 @@ # Get all command line arguments function getargs() { - declare j=0 - declare -a args - - for i in "$@" ; do - { - args[$j]=$i - ((j++)) - } - done - - action=${args[0]} # contains the action to be executed, e.g. "add" or "remove" - flavor=${args[1]} # contains the kernel-flavor, e.g. "default" or "xen" - release=${args[2]} # contains the kernel-release, e.g. "2.6.18-4-default" - image=${args[3]} # contains the full image name, e.g. "vmlinuz-2.6.18-4-default" - initrd=${args[4]} # contains the full initrd name, e.g. "initrd-2.6.18-4-default" + action=$1 # contains the action to be executed, e.g. "add" or "remove" + flavor=$2 # contains the kernel-flavor, e.g. "default" or "xen" + release=$3 # contains the kernel-release, e.g. "2.6.18-4-default" + image=$4 # contains the full image name, e.g. "vmlinuz-2.6.18-4-default" + initrd=$5 # contains the full initrd name, e.g. "initrd-2.6.18-4-default" } @@ -62,30 +52,30 @@ { # Set up the new kernel if [ "$YAST_IS_RUNNING" != instsys ]; then - case $flavor in - (kdump|um) - ;; - (*) - opt_xen_kernel= - case $flavor in - xen*) - set -- $flavor - set -- ${1#xen} - opt_xen_kernel=--xen-kernel=/boot/xen${1:+-$1}.gz - ;; - esac - - # Add the new bootloader entry - update_bootloader --image /boot/$image \ - --initrd /boot/$initrd \ - --default --add \ - --force $opt_xen_kernel \ - --name "Kernel-$release" - - # Run the bootloader (e.g., lilo). - update_bootloader --refresh - ;; - esac + case $flavor in + (kdump|um) + ;; + (*) + opt_xen_kernel= + case $flavor in + xen*) + set -- $flavor + set -- ${1#xen} + opt_xen_kernel=--xen-kernel=/boot/xen${1:+-$1}.gz + ;; + esac + + # Add the new bootloader entry + update_bootloader --image /boot/$image \ + --initrd /boot/$initrd \ + --default --add \ + --force $opt_xen_kernel \ + --name "Kernel-$release" + + # Run the bootloader (e.g., lilo). + update_bootloader --refresh + ;; + esac fi } @@ -96,9 +86,9 @@ function remove_entry() { update_bootloader --image /boot/$image \ - --initrd /boot/$initrd \ + --initrd /boot/$initrd \ --remove --force \ - --name "Kernel-$release" + --name "Kernel-$release" # Run the bootloader (e.g., lilo). update_bootloader --refresh @@ -110,23 +100,23 @@ # Checks if correct amount of arguments is given -if [ "$#" -ne "4" ] ; then +if [ "$#" -ne "5" ] ; then usage fi # Get all given arguments -getargs $@ +getargs "$@" # Find out which action should be executed case $1 in add) # Add a new bootloader entry add_entry - ;; + ;; remove) # Remove an existing bootloader entry remove_entry - ;; + ;; *) # Unknown argument usage ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de