Hello community, here is the log from the commit of package perl-Bootloader checked in at Fri Aug 24 01:55:26 CEST 2007. -------- --- perl-Bootloader/perl-Bootloader.changes 2007-08-21 18:18:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2007-08-23 12:51:05.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Aug 23 12:48:58 CEST 2007 - aosthof@suse.de + +- Added check for /etc/sysconfig/bootloader in bootloader_entry + preventing installation errors in case of shared boot partitions + (#303734) + +------------------------------------------------------------------- +Wed Aug 22 15:16:33 CEST 2007 - aosthof@suse.de + +- Check for defined types in GRUB.pm to prevent perl warnings + (#302174) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.hP1265/_old 2007-08-24 01:55:09.000000000 +0200 +++ /var/tmp/diff_new_pack.hP1265/_new 2007-08-24 01:55:09.000000000 +0200 @@ -12,7 +12,7 @@ Name: perl-Bootloader Version: 0.4.23 -Release: 3 +Release: 5 Requires: perl >= %{perl_version} Requires: perl-gettext Requires: e2fsprogs @@ -66,6 +66,13 @@ /usr/lib/bootloader %changelog +* Thu Aug 23 2007 - aosthof@suse.de +- Added check for /etc/sysconfig/bootloader in bootloader_entry + preventing installation errors in case of shared boot partitions + (#303734) +* Wed Aug 22 2007 - aosthof@suse.de +- Check for defined types in GRUB.pm to prevent perl warnings + (#302174) * Tue Aug 21 2007 - aosthof@suse.de - Check for defined keys in GRUB.pm to prevent perl warnings (#302174) ++++++ bootloader_entry ++++++ --- perl-Bootloader/bootloader_entry 2007-08-20 18:47:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/bootloader_entry 2007-08-23 12:47:24.000000000 +0200 @@ -68,12 +68,12 @@ function add_entry() { # Set up the new kernel - #if [ "$YAST_IS_RUNNING" != instsys ]; then - if [ -f /boot/grub/menu.lst -o \ - -f /etc/lilo.conf -o \ - -f /etc/elilo.conf -o \ - -f /etc/zipl.conf ]; then - case $flavor in + 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*) ++++++ perl-Bootloader-0.4.23.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.23/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.4.23/lib/Bootloader/Core/GRUB.pm --- old/perl-Bootloader-0.4.23/lib/Bootloader/Core/GRUB.pm 2007-08-21 18:18:35.000000000 +0200 +++ new/perl-Bootloader-0.4.23/lib/Bootloader/Core/GRUB.pm 2007-08-22 15:22:35.000000000 +0200 @@ -1636,7 +1636,8 @@ } my ($type) = split(/:/, $go->{$key}||""); - if (defined ($key) and (($key eq "root") or ($key eq "rootnoverify"))) { + + if ($key eq "root" or $key eq "rootnoverify") { $grub_root = $val; $ret{"verifyroot"} = ($key eq "root"); } @@ -1647,10 +1648,10 @@ my $defindex = 0+ $val; $ret{"default"} = $sections[$defindex]; } - elsif ($type eq "path") { + elsif (defined ($type) and $type eq "path") { $ret{$key} = $self->GrubPath2UnixPath ($val, $grub_root); } - elsif ($type eq "bool") { + elsif (defined ($type) and $type eq "bool") { $ret{$key} = "true"; } elsif ($key =~ m/^boot_/) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org