Hello community,
here is the log from the commit of package perl-Bootloader for openSUSE:Factory
checked in at 2012-06-06 10:34:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-05-03 10:59:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.perl-Bootloader.new/perl-Bootloader.changes
2012-06-06 10:34:18.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jun 4 15:40:15 CEST 2012 - mch...@suse.com
+
+- support console related global options gfxterm, serial, gfxbackground and
gfxmode
+- 0.6.4
+
+-------------------------------------------------------------------
Old:
----
perl-Bootloader-0.6.3.tar.bz2
New:
----
perl-Bootloader-0.6.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Bootloader.spec ++++++
--- /var/tmp/diff_new_pack.zWRyCo/_old 2012-06-06 10:34:19.000000000 +0200
+++ /var/tmp/diff_new_pack.zWRyCo/_new 2012-06-06 10:34:19.000000000 +0200
@@ -17,7 +17,7 @@
Name: perl-Bootloader
-Version: 0.6.3
+Version: 0.6.4
Release: 0
Requires: perl-base = %{perl_version}
Requires: e2fsprogs
++++++ perl-Bootloader-0.6.3.tar.bz2 -> perl-Bootloader-0.6.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.6.3/perl-Bootloader.changes
new/perl-Bootloader-0.6.4/perl-Bootloader.changes
--- old/perl-Bootloader-0.6.3/perl-Bootloader.changes 2012-04-27
12:07:25.000000000 +0200
+++ new/perl-Bootloader-0.6.4/perl-Bootloader.changes 2012-06-04
15:47:41.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Jun 4 15:40:15 CEST 2012 - mch...@suse.com
+
+- support console related global options gfxterm, serial, gfxbackground and
gfxmode
+- 0.6.4
+
+-------------------------------------------------------------------
Fri Apr 27 12:06:09 CEST 2012 - mch...@suse.de
- fix after grub2 package update, the system become unbootable. (bnc#758570)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.6.3/src/Core/GRUB2.pm
new/perl-Bootloader-0.6.4/src/Core/GRUB2.pm
--- old/perl-Bootloader-0.6.3/src/Core/GRUB2.pm 2012-04-27 12:07:25.000000000
+0200
+++ new/perl-Bootloader-0.6.4/src/Core/GRUB2.pm 2012-06-04 15:47:41.000000000
+0200
@@ -694,6 +694,10 @@
}
} elsif ($key =~ m/@?GRUB_SERIAL_COMMAND/) {
$ret{"serial"} = $val;
+ } elsif ($key =~ m/@?GRUB_GFXMODE/) {
+ $ret{"gfxmode"} = $val;
+ } elsif ($key =~ m/@?GRUB_BACKGROUND/) {
+ $ret{"gfxbackground"} = $val;
}
}
@@ -833,6 +837,8 @@
my $hiddenmenu = delete $globinfo{"hiddenmenu"} || "";
my $terminal = delete $globinfo{"terminal"} || "";
my $serial = delete $globinfo{"serial"} || "";
+ my $gfxmode = delete $globinfo{"gfxmode"} || "";
+ my $gfxbackground = delete $globinfo{"gfxbackground"} || "";
# $root = " root=$root" if $root ne "";
$vga = " vga=$vga" if $vga ne "";
$append = " $append" if $append ne "";
@@ -866,6 +872,20 @@
$line_ref->{"value"} = $serial;
$serial = "";
}
+ } elsif ($key =~ m/@?GRUB_GFXMODE/) {
+ if ($gfxmode ne "") {
+ $line_ref->{"key"} = "GRUB_GFXMODE";
+ $line_ref->{"value"} = $gfxmode;
+ }
+ $gfxmode = "";
+ } elsif ($key =~ m/@?GRUB_BACKGROUND/) {
+ if ($gfxbackground ne "") {
+ $line_ref->{"key"} = "GRUB_BACKGROUND";
+ $line_ref->{"value"} = $gfxbackground;
+ } else {
+ $line_ref = undef;
+ }
+ $gfxbackground = "";
} elsif ($key =~ m/@?GRUB_TERMINAL/) {
if ($terminal eq "") {
$line_ref->{"key"} = '@GRUB_TERMINAL';
@@ -916,6 +936,19 @@
}
}
+ if ($gfxmode ne "") {
+ push @lines, {
+ "key" => "GRUB_GFXMODE",
+ "value" => "$gfxmode",
+ }
+ }
+
+ if ($gfxbackground ne "") {
+ push @lines, {
+ "key" => "GRUB_BACKGROUND",
+ "value" => "$gfxbackground",
+ }
+ }
return \@lines;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.6.3/src/Core/GRUB2EFI.pm
new/perl-Bootloader-0.6.4/src/Core/GRUB2EFI.pm
--- old/perl-Bootloader-0.6.3/src/Core/GRUB2EFI.pm 2012-04-27
12:07:25.000000000 +0200
+++ new/perl-Bootloader-0.6.4/src/Core/GRUB2EFI.pm 2012-06-04
15:47:41.000000000 +0200
@@ -226,6 +226,16 @@
$timeout = $val;
} elsif ($key =~ m/@?GRUB_HIDDEN_TIMEOUT$/) {
$hidden_timeout = $val;
+ } elsif ($key =~ m/@?GRUB_TERMINAL/) {
+ if ($val =~ m/^(serial|console|gfxterm)$/) {
+ $ret{"terminal"} = $val;
+ }
+ } elsif ($key =~ m/@?GRUB_SERIAL_COMMAND/) {
+ $ret{"serial"} = $val;
+ } elsif ($key =~ m/@?GRUB_GFXMODE/) {
+ $ret{"gfxmode"} = $val;
+ } elsif ($key =~ m/@?GRUB_BACKGROUND/) {
+ $ret{"gfxbackground"} = $val;
}
}
@@ -362,6 +372,10 @@
my $append = delete $globinfo{"append"} || "";
my $timeout = delete $globinfo{"timeout"} || "";
my $hiddenmenu = delete $globinfo{"hiddenmenu"} || "";
+ my $terminal = delete $globinfo{"terminal"} || "";
+ my $serial = delete $globinfo{"serial"} || "";
+ my $gfxmode = delete $globinfo{"gfxmode"} || "";
+ my $gfxbackground = delete $globinfo{"gfxbackground"} || "";
# $root = " root=$root" if $root ne "";
$vga = " vga=$vga" if $vga ne "";
$append = " $append" if $append ne "";
@@ -387,6 +401,39 @@
} elsif ($key =~ m/@?GRUB_HIDDEN_TIMEOUT$/) {
$line_ref->{"value"} = "$hidden_timeout" if "$hidden_timeout" ne
"";
$hidden_timeout = "";
+ } elsif ($key =~ m/@?GRUB_SERIAL_COMMAND/) {
+ if ($serial eq "") {
+ $line_ref->{"key"} = '@GRUB_SERIAL_COMMAND';
+ } else {
+ $line_ref->{"key"} = "GRUB_SERIAL_COMMAND";
+ $line_ref->{"value"} = $serial;
+ $serial = "";
+ }
+ } elsif ($key =~ m/@?GRUB_GFXMODE/) {
+ if ($gfxmode ne "") {
+ $line_ref->{"key"} = "GRUB_GFXMODE";
+ $line_ref->{"value"} = $gfxmode;
+ }
+ $gfxmode = "";
+ } elsif ($key =~ m/@?GRUB_BACKGROUND/) {
+ if ($gfxbackground ne "") {
+ $line_ref->{"key"} = "GRUB_BACKGROUND";
+ $line_ref->{"value"} = $gfxbackground;
+ } else {
+ $line_ref = undef;
+ }
+ $gfxbackground = "";
+ } elsif ($key =~ m/@?GRUB_TERMINAL/) {
+ if ($terminal eq "") {
+ $line_ref->{"key"} = '@GRUB_TERMINAL';
+ $line_ref->{"value"} = "console";
+ } else {
+ $line_ref->{"key"} = "GRUB_TERMINAL";
+ if ($terminal =~ m/^(serial|console|gfxterm)$/) {
+ $line_ref->{"value"} = "$terminal" if "$terminal" ne "";
+ }
+ $terminal = "";
+ }
}
defined $line_ref ? $line_ref : ();
} @lines;
@@ -412,6 +459,34 @@
}
}
+ if ($terminal ne "") {
+ push @lines, {
+ "key" => "GRUB_TERMINAL",
+ "value" => "$terminal",
+ }
+ }
+
+ if ($serial ne "") {
+ push @lines, {
+ "key" => "GRUB_SERIAL_COMMAND",
+ "value" => "$serial",
+ }
+ }
+
+ if ($gfxmode ne "") {
+ push @lines, {
+ "key" => "GRUB_GFXMODE",
+ "value" => "$gfxmode",
+ }
+ }
+
+ if ($gfxbackground ne "") {
+ push @lines, {
+ "key" => "GRUB_BACKGROUND",
+ "value" => "$gfxbackground",
+ }
+ }
+
return \@lines;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/perl-Bootloader-0.6.3/version
new/perl-Bootloader-0.6.4/version
--- old/perl-Bootloader-0.6.3/version 2012-04-27 12:07:25.000000000 +0200
+++ new/perl-Bootloader-0.6.4/version 2012-06-04 15:47:41.000000000 +0200
@@ -1 +1 @@
-0.6.3
+0.6.4
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
