summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
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/any.pm
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/any.pm')
-rw-r--r--perl-install/any.pm8
1 files changed, 5 insertions, 3 deletions
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);