Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2012-02-23 15:33:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old) and /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Bootloader", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes 2011-12-25 17:38:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2012-02-23 15:33:35.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 15 09:16:19 UTC 2012 - [email protected] + +- add-basic-grub2-module.patch : add basic grub2 support + +------------------------------------------------------------------- New: ---- add-basic-grub2-module.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.fZJMwU/_old 2012-02-23 15:33:36.000000000 +0100 +++ /var/tmp/diff_new_pack.fZJMwU/_new 2012-02-23 15:33:36.000000000 +0100 @@ -28,6 +28,7 @@ Source1: update-bootloader Source2: bootloader_entry Source3: boot.readme +Patch: add-basic-grub2-module.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl Conflicts: multipath-tools < 0.4.8-40.25.1 @@ -38,6 +39,7 @@ %prep %setup -q +%patch -p1 rm -rf perl-Bootloader-testsuite mkdir -p lib mv src lib/Bootloader ++++++ add-basic-grub2-module.patch ++++++ ++++ 885 lines (skipped) ++++++ update-bootloader ++++++ --- /var/tmp/diff_new_pack.fZJMwU/_old 2012-02-23 15:33:36.000000000 +0100 +++ /var/tmp/diff_new_pack.fZJMwU/_new 2012-02-23 15:33:36.000000000 +0100 @@ -122,7 +122,7 @@ if ( -f '/usr/bin/zypper' ){ my $zypper_out = qx{zypper --terse tos -l}; if ($zypper_out =~ m/^labelLong\s*(\S.*\S)\s*\nlabelShort\s*(\S.*\S)[\s\n]*$/){ - return $1 if ($1 ne "" && $loader eq "grub"); + return $1 if ($1 ne "" && ($loader eq "grub" || $loader eq "grub2")); return $2 if ($2 ne ""); } } @@ -131,7 +131,7 @@ # Second try: Is there a usable /etc/SuSE-release? # This should really not be used anymore, as the syntax changed # no 'SP1' in the output. - if (open(RELEASE, "</etc/SuSE-release") && $loader eq "grub") { + if (open(RELEASE, "</etc/SuSE-release") && ($loader eq "grub" || $loader eq "grub2")) { # first line is sufficient $namever = <RELEASE>; @@ -212,26 +212,6 @@ exit 0; } -if (Bootloader::Tools::GetBootloader() eq "grub2") -{ - open (LOG, ">>$logname"); - print LOG ("grub2 bootloader, let grub2-mkconfig handle everything\n"); - close LOG; - - if (! -d '/boot/grub2' ) { - open (LOG, ">>$logname"); - print LOG ("grub2: Run grub2-install first!\n"); - close LOG; - - exit 1; - } - - system ("cp /boot/grub2/grub.cfg /boot/grub2/grub.cfg.old"); - system ("/usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg >>$logname 2>&1"); - - exit 0; -} - if ($opt_image and $opt_image !~ m;^/;) { $opt_image = getcwd . '/' . $opt_image } @@ -273,7 +253,7 @@ unless ($opt_name) { if ($opt_xen and $opt_previous) { - if ($loader eq "grub" || $loader eq "lilo") { + if ($loader eq "grub" || $loader eq "lilo" || $loader eq "grub2") { $opt_name = "Previous Xen"; $add_product = 1; } @@ -282,7 +262,7 @@ } } elsif ($opt_xen) { - if ($loader eq "grub" || $loader eq "lilo") { + if ($loader eq "grub" || $loader eq "lilo" || $loader eq "grub2") { $opt_name = "Xen"; $add_product = 1; } @@ -291,7 +271,7 @@ } } elsif ($opt_previous) { - if ($loader eq "grub" || $loader eq "lilo") { + if ($loader eq "grub" || $loader eq "lilo" || $loader eq "grub2") { $opt_name = "Previous Kernel"; $add_product = 1; } @@ -335,7 +315,7 @@ ($opt_name =~ /-bigsmp/) || ($opt_name =~ /-pae/)) { - if ($loader eq "grub") { + if ($loader eq "grub" || $loader eq "grub2") { $opt_name =~ s/-[^-]*$//; $opt_failsafe = "Failsafe -- " . GetProduct() . " - " . $opt_name; $opt_name = GetProduct() . " - " . $opt_name; @@ -347,7 +327,7 @@ } # Naming scheme for all xen kernels, thus xen and xenpae elsif ($opt_xen) { - if ($loader eq "grub") { + if ($loader eq "grub" || $loader eq "grub2") { my $version = $opt_name; $version =~ s/-xen.*$//; @@ -368,7 +348,7 @@ $flavor = ucfirst ($flavor); # Create long labels for grub - if ($loader eq "grub") { + if ($loader eq "grub" || $loader eq "grub2") { my $version = $opt_name; $version =~ s/-[^-]*$//; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
