Hello community, here is the log from the commit of package perl-Bootloader checked in at Fri Dec 7 20:17:35 CET 2007. -------- --- perl-Bootloader/perl-Bootloader.changes 2007-12-05 14:53:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2007-12-07 17:23:18.000000000 +0100 @@ -1,0 +2,12 @@ +Fri Dec 7 17:22:00 CET 2007 - aosthof@suse.de + +- Distinguish between various xen kernel names (#340922) +- Version bump to 0.4.41 + +------------------------------------------------------------------- +Fri Dec 7 17:21:02 CET 2007 - aosthof@suse.de + +- Corrected mechanism of removing obsolete boot entries (#285421) +- Version bump to 0.4.40 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.4.39.tar.bz2 New: ---- perl-Bootloader-0.4.41.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.kT6530/_old 2007-12-07 20:16:13.000000000 +0100 +++ /var/tmp/diff_new_pack.kT6530/_new 2007-12-07 20:16:13.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.4.39) +# spec file for package perl-Bootloader (Version 0.4.41) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # norootforbuild Name: perl-Bootloader -Version: 0.4.39 +Version: 0.4.41 Release: 1 Requires: perl >= %{perl_version} Requires: perl-gettext @@ -66,6 +66,12 @@ /usr/lib/bootloader %changelog +* Fri Dec 07 2007 - aosthof@suse.de +- Distinguish between various xen kernel names (#340922) +- Version bump to 0.4.41 +* Fri Dec 07 2007 - aosthof@suse.de +- Corrected mechanism of removing obsolete boot entries (#285421) +- Version bump to 0.4.40 * Wed Dec 05 2007 - aosthof@suse.de - Fixed removal of xen (-pae) entries (#345188) - Version bump to 0.4.39 ++++++ perl-Bootloader-0.4.39.tar.bz2 -> perl-Bootloader-0.4.41.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.39/lib/Bootloader/Tools.pm new/perl-Bootloader-0.4.41/lib/Bootloader/Tools.pm --- old/perl-Bootloader-0.4.39/lib/Bootloader/Tools.pm 2007-11-30 10:21:32.000000000 +0100 +++ new/perl-Bootloader-0.4.41/lib/Bootloader/Tools.pm 2007-12-07 17:21:31.000000000 +0100 @@ -1592,29 +1592,31 @@ !$match; } @sections; - # FIXME: detect wether we have an entry with non existing initrd (#276923) - # and remove this section. + # Detect wether we have an entry with an initrd line referring to a non + # existing initrd file and remove this section respectively. if ($loader eq "grub") { @sections = grep { - my $match = 0; + my $match = 1; - my $initrd_name = $_->{"initrd"}; - my $other_part = 0; + # Check if there is a member called "initrd". If this is not the + # case, do not throw out the corresponding section because boot + # entries without an initrd are allowed, too. + if (exists $_->{"initrd"}) { + my $initrd_name = $_->{"initrd"}; + my $other_part = 0; + + $other_part = 1 if $initrd_name =~ m/\(hd.+\)/; + $initrd_name =~ s/^.*(initrd-.+)$/$1/; + $initrd_name = "/boot/" . $initrd_name; - $other_part = 1 if $initrd_name =~ m/\(hd.+\)/; - $initrd_name =~ s/^.*(initrd-.+)$/$1/; - $initrd_name = "/boot/" . $initrd_name; - - if (-f $initrd_name or $other_part or $_->{"type"} ne "image") { - $match = 1; - - if (!-f $initrd_name and $_->{"type"} eq "xen") { + if (!$other_part and !-f $initrd_name and + ($_->{"type"} eq "image" or $_->{"type"} eq "xen")) { $match = 0; } - } - $default_removed = 1 - if !$match and $default_section eq $_->{"name"}; + $default_removed = 1 + if !$match and $default_section eq $_->{"name"}; + } $match; } @sections; } ++++++ update-bootloader ++++++ --- perl-Bootloader/update-bootloader 2007-12-05 14:53:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Bootloader/update-bootloader 2007-12-07 17:23:18.000000000 +0100 @@ -302,11 +302,17 @@ # Naming scheme for all xen kernels, thus xen and xenpae elsif ($opt_xen) { if ($loader eq "grub") { - $opt_name =~ s/-xen.*$//; - $opt_xen_name = "XEN -- " . GetProduct() . " - " . $opt_name; + my $opt_version = $opt_name; + $opt_version =~ s/-xen.*$//; + + $opt_name =~ s/^.*(xen.*)$/$1/; + $opt_name = ucfirst ($opt_name); + + $opt_xen_name = "$opt_name -- " . GetProduct() . " - " . $opt_name; } else { - $opt_name = "XEN"; + $opt_name =~ s/^.*(xen.*)$/$1/; + $opt_name = ucfirst ($opt_name); } } # Naming scheme for all other kernels ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org