Hello community, here is the log from the commit of package perl-Bootloader checked in at Thu May 31 21:09:52 CEST 2007. -------- --- perl-Bootloader/perl-Bootloader.changes 2007-04-25 19:13:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2007-05-31 15:47:18.000000000 +0200 @@ -1,0 +2,23 @@ +Thu May 31 15:46:13 CEST 2007 - aosthof@suse.de + +- Fixed creation of failsafe sections in boot menu, this issue is + also related to bugs #272236, #272208 and #277405 +- Verion bump to 0.4.16 + +------------------------------------------------------------------- +Thu May 31 15:16:46 CEST 2007 - aosthof@suse.de + +- The last commit is also related to bugs #272236 and #272208 + +------------------------------------------------------------------- +Thu May 31 14:59:11 CEST 2007 - aosthof@suse.de + +- Fixed label naming scheme for boot entries so that debug or + vanilla kernel entries for instance get named correctly (#277405) + +------------------------------------------------------------------- +Thu Apr 26 13:41:38 CEST 2007 - aosthof@suse.de + +- Fixed failsafe parameters to boot in runlevel 3 instead of 5 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.4.15.tar.bz2 New: ---- perl-Bootloader-0.4.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.b15981/_old 2007-05-31 21:09:35.000000000 +0200 +++ /var/tmp/diff_new_pack.b15981/_new 2007-05-31 21:09:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.4.15) +# spec file for package perl-Bootloader (Version 0.4.16) # # 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.15 +Version: 0.4.16 Release: 1 Requires: perl >= %{perl_version} Requires: perl-gettext @@ -34,6 +34,10 @@ Authors: -------- + Alexander Osthof <aosthof@novell.com> + Stefan Fent <sf@novell.com> + Joachim Plack <jplack@novell.com> + Olaf Dabrunz <od@novell.com> Jiri Srain <jsrain@suse.cz> %prep @@ -63,6 +67,17 @@ /usr/lib/bootloader %changelog +* Thu May 31 2007 - aosthof@suse.de +- Fixed creation of failsafe sections in boot menu, this issue is + also related to bugs #272236, #272208 and #277405 +- Verion bump to 0.4.16 +* Thu May 31 2007 - aosthof@suse.de +- The last commit is also related to bugs #272236 and #272208 +* Thu May 31 2007 - aosthof@suse.de +- Fixed label naming scheme for boot entries so that debug or + vanilla kernel entries for instance get named correctly (#277405) +* Thu Apr 26 2007 - aosthof@suse.de +- Fixed failsafe parameters to boot in runlevel 3 instead of 5 * Wed Apr 25 2007 - aosthof@suse.de - Fixed usage of md raids for ia64 (#233255) - Reverted EFI Bootloader Label code in ELILO.pm to display gui ++++++ perl-Bootloader-0.4.15.tar.bz2 -> perl-Bootloader-0.4.16.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.15/lib/Bootloader/Tools.pm new/perl-Bootloader-0.4.16/lib/Bootloader/Tools.pm --- old/perl-Bootloader-0.4.15/lib/Bootloader/Tools.pm 2007-04-25 19:08:23.000000000 +0200 +++ new/perl-Bootloader-0.4.16/lib/Bootloader/Tools.pm 2007-04-26 13:42:51.000000000 +0200 @@ -1098,13 +1098,13 @@ chomp ($arch); if ($arch eq "i386") { - $new{"append"} = "showopts ide=nodma apm=off acpi=off noresume nosmp noapic maxcpus=0 edd=off"; + $new{"append"} = "showopts ide=nodma apm=off acpi=off noresume nosmp noapic maxcpus=0 edd=off 3"; } elsif ($arch eq "x86_64") { - $new{"append"} = "showopts ide=nodma apm=off acpi=off noresume edd=off"; + $new{"append"} = "showopts ide=nodma apm=off acpi=off noresume edd=off 3"; } elsif ($arch eq "ia64") { - $new{"append"} = "ide=nodma nohalt noresume"; + $new{"append"} = "ide=nodma nohalt noresume 3"; } else { print ("Architecture $arch does not support failsafe entries.\n"); ++++++ update-bootloader ++++++ --- perl-Bootloader/update-bootloader 2007-04-25 19:09:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/update-bootloader 2007-05-31 15:34:58.000000000 +0200 @@ -289,12 +289,14 @@ } # Naming scheme for all other kernels else { - if ($loader eq "grub") { - $opt_name = GetProduct() if $add_product; - } - else { - $opt_name = GetProduct() . " -- " . $opt_name if $add_product; - } + my $flavor = $opt_name; + $flavor =~ s/.*-(\w+)/\1/; + $flavor = ucfirst ($flavor); + + my $version = $opt_name; + $version =~ s/-[^-]*$//; + + $opt_name = $flavor . " -- " . GetProduct() . " - " . $opt_name; } } @@ -338,9 +340,16 @@ my $arch = `uname --hardware-platform`; chomp ($arch); - # Add a "Failsafe" section - if ((($arch eq "i386") || ($arch eq "x86_64") || ($arch eq "ia64")) - && $opt_xen != 1) { + # Add a "Failsafe" section, but only if the underlying architecture is + # one of i386, x86_84 or ia64 and the kernel flavor is either default, + # smp or bigsmp and not a xen kernel. + if ((($arch eq "i386") || + ($arch eq "x86_64") || + ($arch eq "ia64")) && + (($opt_image =~ /-default/) || + ($opt_image =~ /-smp/) || + ($opt_image =~ /-bigsmp/)) && + ($opt_xen != 1)) { AddSection($opt_failsafe, @params); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org