From 91fe91af055548dcedc928236d6ec5e97d843834 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 19 Mar 2012 18:33:40 +0000 Subject: - 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 --- perl-install/any.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'perl-install/any.pm') 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); -- cgit v1.2.1