Hello community, here is the log from the commit of package perl-Bootloader checked in at Thu Apr 12 18:13:52 CEST 2007. -------- --- perl-Bootloader/perl-Bootloader.changes 2007-04-03 17:27:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2007-04-11 18:40:20.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Apr 11 18:36:37 CEST 2007 - aosthof@suse.de + +- Corrected resolution of symlinks in Tools.pm (#244033) + +------------------------------------------------------------------- +Wed Apr 11 18:32:45 CEST 2007 - aosthof@suse.de + +- Adapted EFI Bootloader Label code in ELILO.pm (#242985) + --> Renamed "boot_efilabel" flag to "efilabel" + --> Removed "boot_rm_efilabel" flag because it's now obsolete + +------------------------------------------------------------------- @@ -23,0 +36,6 @@ +Following changes all refer to bugs #252911 and #255851 which +indeed are bugs against openSUSE 10.2 & 10.3, however those bugs +will occur in SLES10-SP1 as well. Thus, those fixes are necessary +to not mess up configuration after kernel-updates. + +Related (fixes) features: #232, #2154, #11011, #300543 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.m20502/_old 2007-04-12 18:13:33.000000000 +0200 +++ /var/tmp/diff_new_pack.m20502/_new 2007-04-12 18:13:33.000000000 +0200 @@ -12,7 +12,7 @@ Name: perl-Bootloader Version: 0.4.14 -Release: 1 +Release: 3 Requires: perl >= %{perl_version} Requires: perl-gettext Requires: mdadm e2fsprogs @@ -63,6 +63,12 @@ /usr/lib/bootloader %changelog +* Wed Apr 11 2007 - aosthof@suse.de +- Corrected resolution of symlinks in Tools.pm (#244033) +* Wed Apr 11 2007 - aosthof@suse.de +- Adapted EFI Bootloader Label code in ELILO.pm (#242985) + --> Renamed "boot_efilabel" flag to "efilabel" + --> Removed "boot_rm_efilabel" flag because it's now obsolete * Tue Apr 03 2007 - aosthof@suse.de - Cosmetic correction in Tools.pm * Tue Apr 03 2007 - aosthof@suse.de @@ -73,6 +79,11 @@ * Mon Apr 02 2007 - aosthof@suse.de - Fixed typo in GRUB.pm * Mon Apr 02 2007 - aosthof@suse.de + Following changes all refer to bugs #252911 and #255851 which + indeed are bugs against openSUSE 10.2 & 10.3, however those bugs + will occur in SLES10-SP1 as well. Thus, those fixes are necessary + to not mess up configuration after kernel-updates. + Related (fixes) features: #232, #2154, #11011, #300543 - Added function GrubDev2MountPoint() to GRUB.pm to be able to retrieve mountpoints of grub devices - Fixed functions GrubDev2UnixDev(), UnixDev2GrubDev(), ++++++ perl-Bootloader-0.4.14.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.14/lib/Bootloader/Core/ELILO.pm new/perl-Bootloader-0.4.14/lib/Bootloader/Core/ELILO.pm --- old/perl-Bootloader-0.4.14/lib/Bootloader/Core/ELILO.pm 2007-02-14 11:39:21.000000000 +0100 +++ new/perl-Bootloader-0.4.14/lib/Bootloader/Core/ELILO.pm 2007-04-11 18:45:05.000000000 +0200 @@ -173,8 +173,8 @@ relocatable => "bool:Allow Attempt to relocate:", # shadow entries for efi boot manager - boot_efilabel => "string:EFI Boot Manager Label::", - boot_rm_efilabel => "bool:Remove existing EFI Boot Manager Entries by Name:", + efilabel => "string:EFI Boot Manager Label::", + #boot_rm_efilabel => "bool:Remove existing EFI Boot Manager Entries by Name:", }; my $go = $exports{"global_options"}; @@ -404,8 +404,8 @@ # handle 'hidden magic' entries map { - s/^/##YaST - / - if /^boot_efilabel/ or /^boot_rm_efilabel/; + s/^/##YaST - / if /^efilabel/; + #if /^boot_efilabel/ or /^boot_rm_efilabel/; } @{$elilo_conf}; return { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.14/lib/Bootloader/Tools.pm new/perl-Bootloader-0.4.14/lib/Bootloader/Tools.pm --- old/perl-Bootloader-0.4.14/lib/Bootloader/Tools.pm 2007-04-03 17:27:20.000000000 +0200 +++ new/perl-Bootloader-0.4.14/lib/Bootloader/Tools.pm 2007-04-11 18:40:20.000000000 +0200 @@ -1077,7 +1077,7 @@ my $mp_ref = ReadMountPoints (); my $root_mp = ''; my $boot_mp = ''; - my $valid_part = 0; + my $valid_part = 1; while ((my $k, my $v) = each (%$mp_ref)) { $root_mp = $v if ($k eq "/"); @@ -1089,14 +1089,11 @@ foreach my $s (@sections) { while ((my $k, my $v) = each (%$s)) { if ($k eq "initrd" || $k eq "image" || $k eq "kernel") { - + # Check if $v has a grub device prefix if (($v =~ s#\/.*$##) && $v ne '') { my $unix_dev = $lib_ref->GrubDev2UnixDev($v); - if ($unix_dev eq $root_mp || $unix_dev eq $boot_mp) { - $valid_part = 1; - } - else { + unless ($unix_dev eq $root_mp || $unix_dev eq $boot_mp) { $valid_part = 0; } } @@ -1113,7 +1110,7 @@ my $index = 0; foreach my $elem (@$v) { while ((my $k, my $v) = each (%$elem)) { - if ((index ($v, "vmlinuz") >= 0 || index ($v, "initrd") >= 0) + if (($v =~ m/vmlinu[xz]/ || index ($v, "initrd") >= 0) && ($link_target = readlink ($v))) { $v = (split (/ /, $v))[0]; chomp ($link_target); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org