summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2012-03-19 18:33:40 +0000
committerColin Guthrie <colin@mageia.org>2012-03-19 18:33:40 +0000
commita2226ee44c296ff022c3da1bb199e8670823e12d (patch)
tree7af30a97e180b87b072aba5082a04db1cde6eded /perl-install
parent469d93a7cee081dbe4fea460eed7c07cd9d9d174 (diff)
downloaddrakx-a2226ee44c296ff022c3da1bb199e8670823e12d.tar
drakx-a2226ee44c296ff022c3da1bb199e8670823e12d.tar.gz
drakx-a2226ee44c296ff022c3da1bb199e8670823e12d.tar.bz2
drakx-a2226ee44c296ff022c3da1bb199e8670823e12d.tar.xz
drakx-a2226ee44c296ff022c3da1bb199e8670823e12d.zip
- use "splash" on the kernel command line vs. "splash=silent" as per upstream
code (e.g. plymouth, systemd and others) - support the "quiet" kernel command line argument to hide kernel text
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS4
-rw-r--r--perl-install/any.pm8
-rw-r--r--perl-install/bootloader.pm3
-rw-r--r--perl-install/install/steps.pm2
4 files changed, 12 insertions, 5 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 33e966eb9..8bd102364 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+- use "splash" on the kernel command line vs. "splash=silent" as per upstream
+ code (e.g. plymouth, systemd and others)
+- support the "quiet" kernel command line argument to hide kernel text
+
Version 13.93 - 12 March 2012
- fix mgaapplet crashing on live migration when there's a new major version of
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 056566314..47b6d2f60 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -130,12 +130,13 @@ sub setupBootloaderBeforeStandalone {
my $allow_fb = listlength(cat_("/proc/fb"));
my $cmdline = cat_('/proc/cmdline');
my $vga_fb = first($cmdline =~ /\bvga=(\S+)/);
- my $quiet = $cmdline =~ /\bsplash=silent\b/;
- setupBootloaderBefore($do_pkgs, $b, $all_hds, $fstab, $keyboard, $allow_fb, $vga_fb, $quiet);
+ my $splash = $cmdline =~ /\bsplash\b/;
+ my $quiet = $cmdline =~ /\bquiet\b/;
+ setupBootloaderBefore($do_pkgs, $b, $all_hds, $fstab, $keyboard, $allow_fb, $vga_fb, $splash, $quiet);
}
sub setupBootloaderBefore {
- my ($_do_pkgs, $bootloader, $all_hds, $fstab, $keyboard, $allow_fb, $vga_fb, $quiet) = @_;
+ my ($_do_pkgs, $bootloader, $all_hds, $fstab, $keyboard, $allow_fb, $vga_fb, $splash, $quiet) = @_;
require bootloader;
#- auto_install backward compatibility
@@ -207,6 +208,7 @@ sub setupBootloaderBefore {
my $need_fb = -e "$::prefix/usr/share/bootsplash/scripts/make-boot-splash";
bootloader::suggest($bootloader, $all_hds,
vga_fb => ($force_vga || $vga && $need_fb) && $vga_fb,
+ splash => $splash,
quiet => $quiet);
$bootloader->{keytable} ||= keyboard::keyboard2kmap($keyboard);
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 28a21a242..766cd2cf6 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1057,7 +1057,8 @@ sub suggest {
{
root => $root,
if_($options{vga_fb}, vga => $options{vga_fb}), #- using framebuffer
- if_($options{vga_fb} && $options{quiet}, append => "splash=silent"),
+ if_($options{vga_fb} && $options{splash}, append => "splash"),
+ if_($options{quiet}, append => "quiet"),
});
if ($options{vga_fb} && $e->{label} eq 'linux') {
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 968f076f1..4d9e2a0c3 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -754,7 +754,7 @@ sub read_bootloader_config {
sub setupBootloaderBefore {
my ($o) = @_;
any::setupBootloaderBefore($o->do_pkgs, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{keyboard},
- $o->{allowFB}, $o->{vga}, $o->{meta_class} ne 'server');
+ $o->{allowFB}, $o->{vga}, $o->{meta_class} ne 'server', $o->{meta_class} ne 'server');
}
sub setupBootloader {