summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-04-07 10:03:43 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-04-07 17:41:52 +0200
commitf56bb7cd1c44fabf610ada962b494e66ff2852f9 (patch)
treed41375e3889226a12fd5689e7c615b8d14f05d93
parentaa8fdb4d23ee5df62283a64f305623c06658a973 (diff)
downloaddrakx-f56bb7cd1c44fabf610ada962b494e66ff2852f9.tar
drakx-f56bb7cd1c44fabf610ada962b494e66ff2852f9.tar.gz
drakx-f56bb7cd1c44fabf610ada962b494e66ff2852f9.tar.bz2
drakx-f56bb7cd1c44fabf610ada962b494e66ff2852f9.tar.xz
drakx-f56bb7cd1c44fabf610ada962b494e66ff2852f9.zip
keep vga= arg when switching to grub2 (mga#9888)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/bootloader.pm3
-rw-r--r--perl-install/install/NEWS3
3 files changed, 9 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 5dd30a0c9..6cc14258b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot:
+ o keep vga= parameter when switching to grub2 (mga#9888)
+
Version 16.78 - 7 April 2015
- drakboot:
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 3dc05d779..38dfaee7d 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1753,6 +1753,9 @@ sub write_grub2 {
# set default parameters:
my ($entry) = grep { $_->{kernel_or_dev} =~ /vmlin/ } @{$bootloader->{entries}};
my $append = $entry->{append};
+ if (my $vga = $entry->{vga} || $bootloader->{vga}) {
+ $append .= " vga=$vga";
+ }
$append =~ s/root=\S+//g;
$append =~ s/\bro\b//g;
$append =~ s/\s+/ /g;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c1b87cf5f..ae2897af7 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- bootloader config:
+ o keep vga= parameter when switching to grub2 (mga#9888)
+
Version 16.78 - 7 April 2015
- bootloader: