Hello community, here is the log from the commit of package perl-Bootloader for openSUSE:Factory checked in at 2013-10-02 13:32:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old) and /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes 2013-08-27 15:09:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes 2013-10-02 13:32:06.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Oct 1 09:10:04 CEST 2013 - snw...@suse.de + +- grub2-efi: fix installation boot parameters not written (bnc#824609) +- 0.710 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.709.tar.xz New: ---- perl-Bootloader-0.710.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.UXUud1/_old 2013-10-02 13:32:07.000000000 +0200 +++ /var/tmp/diff_new_pack.UXUud1/_new 2013-10-02 13:32:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Bootloader -Version: 0.709 +Version: 0.710 Release: 0 Requires: coreutils Requires: e2fsprogs ++++++ perl-Bootloader-0.709.tar.xz -> perl-Bootloader-0.710.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.709/perl-Bootloader.changes new/perl-Bootloader-0.710/perl-Bootloader.changes --- old/perl-Bootloader-0.709/perl-Bootloader.changes 2013-08-26 14:35:52.000000000 +0200 +++ new/perl-Bootloader-0.710/perl-Bootloader.changes 2013-10-01 09:10:52.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 1 09:10:04 CEST 2013 - snw...@suse.de + +- grub2-efi: fix installation boot parameters not written +- 0.710 + +------------------------------------------------------------------- Mon Aug 26 14:29:03 CEST 2013 - snw...@suse.de - update-bootloader refresh cleanup and introduce reinit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.709/src/Core/GRUB.pm new/perl-Bootloader-0.710/src/Core/GRUB.pm --- old/perl-Bootloader-0.709/src/Core/GRUB.pm 2013-08-26 14:35:52.000000000 +0200 +++ new/perl-Bootloader-0.710/src/Core/GRUB.pm 2013-08-27 10:53:21.000000000 +0200 @@ -308,7 +308,7 @@ } if(!$part_ok) { # partition not found, making something up... - if($dev =~ m#^/dev/(?:vx|das|[ehpsvx])d[a-z]{1,2}$#) { + if($dev =~ m#^/dev/(?:xv|das|[ehpsvx])d[a-z]{1,2}$#) { $u_dev .= ""; } elsif($dev =~ m#^/dev/disk/#) { @@ -424,7 +424,7 @@ $partition = undef; if( - $original =~ m#^/dev/(?:vx|das|[ehpsvx])d[a-z]{1,2}(\d+)$# || + $original =~ m#^/dev/(?:xv|das|[ehpsvx])d[a-z]{1,2}(\d+)$# || $original =~ m#^/dev/\S+\-part(\d+)$# || $original =~ m#^/dev(?:/[^/]+){1,2}p(\d+)$# ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.709/src/Core/GRUB2EFI.pm new/perl-Bootloader-0.710/src/Core/GRUB2EFI.pm --- old/perl-Bootloader-0.709/src/Core/GRUB2EFI.pm 2013-08-26 14:35:52.000000000 +0200 +++ new/perl-Bootloader-0.710/src/Core/GRUB2EFI.pm 2013-10-01 09:09:37.000000000 +0200 @@ -88,15 +88,24 @@ $sect_info{"usage"} = "linux"; } - if ($cfg2 =~ /^\s+linux\s+([^\s]+)\s*(.*)$/m) { - my $append = $2; - $sect_info{"image"} = $1; + # bnc#824609 - installation boot parameters not written to GRUB_CMDLINE_LINUX_DEFAULT + # we need to match linuxefi command, otherwise the kernel append will lost + if ($cfg2 =~ /^\s+(linux|linuxefi)\s+([^\s]+)\s*(.*)$/m) { + my $append = $3; + $sect_info{"image"} = $2; + my $command = $1; if ($append =~ /root=/) { $append =~ s/root=([^\s]+)\s*//; $sect_info{"root"} = $1; } + # the ro is part of linuxefi entries created by grub2 scripts + # not part of kernel append by yast + if ( $command eq "linuxefi" ) { + $append =~ s/^ro\s*//; + } + if ($append =~ /vga=/) { $append =~ s/vga=([^\s]+)\s*//; $sect_info{"vgamode"} = $1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.709/src/Tools.pm new/perl-Bootloader-0.710/src/Tools.pm --- old/perl-Bootloader-0.709/src/Tools.pm 2013-08-26 14:35:52.000000000 +0200 +++ new/perl-Bootloader-0.710/src/Tools.pm 2013-09-12 09:41:14.000000000 +0200 @@ -985,7 +985,7 @@ =cut sub GetGlobals() { - return $lib_ref->GetGlobals(); + return $lib_ref->GetGlobalSettings(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/perl-Bootloader-0.709/version new/perl-Bootloader-0.710/version --- old/perl-Bootloader-0.709/version 2013-08-26 14:35:52.000000000 +0200 +++ new/perl-Bootloader-0.710/version 2013-10-01 09:09:56.000000000 +0200 @@ -1 +1 @@ -0.709 +0.710 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org