Hello community,
here is the log from the commit of package perl-Bootloader for openSUSE:Factory
checked in at 2012-07-14 10:21:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Bootloader (Old)
and /work/SRC/openSUSE:Factory/.perl-Bootloader.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Bootloader", Maintainer is "snw...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Bootloader/perl-Bootloader.changes
2012-07-09 09:59:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes
2012-07-14 11:51:11.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jul 13 15:45:47 CEST 2012 - mch...@suse.com
+
+- fix new menuentry format introduced by 2.0
+- support failsafe kernel parameters
+- 0.6.7
+
+-------------------------------------------------------------------
Old:
----
perl-Bootloader-0.6.6.tar.bz2
New:
----
perl-Bootloader-0.6.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.zZ9IS7/_old 2012-07-14 11:51:13.000000000 +0200
+++ /var/tmp/diff_new_pack.zZ9IS7/_new 2012-07-14 11:51:13.000000000 +0200
@@ -17,7 +17,7 @@
Name: perl-Bootloader
-Version: 0.6.6
+Version: 0.6.7
Release: 0
Requires: perl-base = %{perl_version}
Requires: e2fsprogs
++++++ perl-Bootloader-0.6.6.tar.bz2 -> perl-Bootloader-0.6.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.6.6/perl-Bootloader.changes
new/perl-Bootloader-0.6.7/perl-Bootloader.changes
--- old/perl-Bootloader-0.6.6/perl-Bootloader.changes 2012-07-06
14:20:59.000000000 +0200
+++ new/perl-Bootloader-0.6.7/perl-Bootloader.changes 2012-07-13
15:46:49.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Jul 13 15:45:47 CEST 2012 - mch...@suse.com
+
+- fix new menuentry format introduced by 2.0
+- support failsafe kernel parameters
+- 0.6.7
+
+-------------------------------------------------------------------
Fri Jul 6 14:18:45 CEST 2012 - mch...@suse.com
- use 'auto' for default gfxmode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.6.6/src/Core/GRUB2.pm
new/perl-Bootloader-0.6.7/src/Core/GRUB2.pm
--- old/perl-Bootloader-0.6.6/src/Core/GRUB2.pm 2012-07-06 14:20:59.000000000
+0200
+++ new/perl-Bootloader-0.6.7/src/Core/GRUB2.pm 2012-07-13 15:46:49.000000000
+0200
@@ -474,9 +474,23 @@
my @confs = @{$files{Bootloader::Path::Grub2_conf()} || []};
my @entries = ();
+ my $submenu = "";
foreach my $conf (@confs) {
- if ($conf =~ /^menuentry\s+['"](.*)['"]\s+/) {
- push @entries, { "menuentry" => $1 };
+ my $menuentry = "";
+
+ if ($conf =~ /^menuentry\s+['"](.*?)['"]\s+/) {
+ $menuentry = $1;
+ $submenu = "";
+ } elsif ($conf =~ m/^submenu\s+['"](.*?)['"]\s+/) {
+ $submenu = $1;
+ }
+ if ($submenu ne "") {
+ if ($conf =~ m/^\s+menuentry\s+['"](.*?)['"]\s+/) {
+ $menuentry = "$submenu>$1"
+ }
+ }
+ if ($menuentry ne "") {
+ push @entries, { "menuentry" => $menuentry };
}
}
@@ -702,6 +716,8 @@
$ret{"gfxtheme"} = $val;
} elsif ($key =~ m/@?GRUB_DISTRIBUTOR/) {
$ret{"distributor"} = $val;
+ } elsif ($key =~ m/@?GRUB_CMDLINE_LINUX_RECOVERY$/) {
+ $ret{"append_failsafe"} = $val;
}
}
@@ -779,6 +795,13 @@
'value' => 'quiet splash=silent',
},
{
+ 'key' => 'GRUB_CMDLINE_LINUX_RECOVERY',
+ 'value' => 'single',
+ 'comment_before' => [
+ '# kernel command line options for failsafe mode',
+ ],
+ },
+ {
'key' => 'GRUB_CMDLINE_LINUX',
'value' => '""',
},
@@ -844,6 +867,7 @@
my $gfxmode = delete $globinfo{"gfxmode"} || "";
my $gfxtheme = delete $globinfo{"gfxtheme"} || "";
my $distributor = delete $globinfo{"distributor"} || "";
+ my $append_failsafe = delete $globinfo{"append_failsafe"} || "";
# $root = " root=$root" if $root ne "";
$vga = " vga=$vga" if $vga ne "";
$append = " $append" if $append ne "";
@@ -905,6 +929,9 @@
} elsif ($key =~ m/@?GRUB_DISTRIBUTOR/) {
$line_ref->{"value"} = "$distributor" if "$distributor" ne "";
$distributor = "";
+ } elsif ($key =~ m/@?GRUB_CMDLINE_LINUX_RECOVERY$/) {
+ $line_ref->{"value"} = "$append_failsafe" if "$append_failsafe" ne
"";
+ $append_failsafe = "";
}
defined $line_ref ? $line_ref : ();
} @lines;
@@ -964,6 +991,13 @@
"value" => "$distributor",
}
}
+
+ if ("$append_failsafe" ne "") {
+ push @lines, {
+ "key" => "GRUB_CMDLINE_LINUX_RECOVERY",
+ "value" => "$append_failsafe",
+ }
+ }
return \@lines;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.6.6/src/Core/GRUB2EFI.pm
new/perl-Bootloader-0.6.7/src/Core/GRUB2EFI.pm
--- old/perl-Bootloader-0.6.6/src/Core/GRUB2EFI.pm 2012-07-06
14:20:59.000000000 +0200
+++ new/perl-Bootloader-0.6.7/src/Core/GRUB2EFI.pm 2012-07-13
15:46:49.000000000 +0200
@@ -137,9 +137,23 @@
my @confs = @{$files{Bootloader::Path::Grub2_eficonf()} || []};
my @entries = ();
+ my $submenu = "";
foreach my $conf (@confs) {
- if ($conf =~ /^menuentry\s+['"](.*)['"]\s+/) {
- push @entries, { "menuentry" => $1 };
+ my $menuentry = "";
+
+ if ($conf =~ /^menuentry\s+['"](.*?)['"]\s+/) {
+ $menuentry = $1;
+ $submenu = "";
+ } elsif ($conf =~ m/^submenu\s+['"](.*?)['"]\s+/) {
+ $submenu = $1;
+ }
+ if ($submenu ne "") {
+ if ($conf =~ m/^\s+menuentry\s+['"](.*?)['"]\s+/) {
+ $menuentry = "$submenu>$1"
+ }
+ }
+ if ($menuentry ne "") {
+ push @entries, { "menuentry" => $menuentry };
}
}
@@ -242,6 +256,8 @@
$ret{"gfxtheme"} = $val;
} elsif ($key =~ m/@?GRUB_DISTRIBUTOR/) {
$ret{"distributor"} = $val;
+ } elsif ($key =~ m/@?GRUB_CMDLINE_LINUX_RECOVERY$/) {
+ $ret{"append_failsafe"} = $val;
}
}
@@ -318,6 +334,13 @@
'value' => 'quiet splash=silent',
},
{
+ 'key' => 'GRUB_CMDLINE_LINUX_RECOVERY',
+ 'value' => 'single',
+ 'comment_before' => [
+ '# kernel command line options for failsafe mode',
+ ],
+ },
+ {
'key' => 'GRUB_CMDLINE_LINUX',
'value' => '""',
},
@@ -383,6 +406,7 @@
my $gfxmode = delete $globinfo{"gfxmode"} || "";
my $gfxtheme = delete $globinfo{"gfxtheme"} || "";
my $distributor = delete $globinfo{"distributor"} || "";
+ my $append_failsafe = delete $globinfo{"append_failsafe"} || "";
# $root = " root=$root" if $root ne "";
$vga = " vga=$vga" if $vga ne "";
$append = " $append" if $append ne "";
@@ -444,6 +468,9 @@
} elsif ($key =~ m/@?GRUB_DISTRIBUTOR/) {
$line_ref->{"value"} = "$distributor" if "$distributor" ne "";
$distributor = "";
+ } elsif ($key =~ m/@?GRUB_CMDLINE_LINUX_RECOVERY$/) {
+ $line_ref->{"value"} = "$append_failsafe" if "$append_failsafe" ne
"";
+ $append_failsafe = "";
}
defined $line_ref ? $line_ref : ();
} @lines;
@@ -503,6 +530,13 @@
"value" => "$distributor",
}
}
+
+ if ("$append_failsafe" ne "") {
+ push @lines, {
+ "key" => "GRUB_CMDLINE_LINUX_RECOVERY",
+ "value" => "$append_failsafe",
+ }
+ }
return \@lines;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.6.6/version
new/perl-Bootloader-0.6.7/version
--- old/perl-Bootloader-0.6.6/version 2012-07-06 14:20:59.000000000 +0200
+++ new/perl-Bootloader-0.6.7/version 2012-07-13 15:46:49.000000000 +0200
@@ -1 +1 @@
-0.6.6
+0.6.7
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
