summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-04-08 23:48:47 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-04-08 23:48:47 +0000
commit7594e76d93c3cc6410d222fa261d3937ddb6fc43 (patch)
tree977699986a8d00fe8303a71b22dac712a916bdd3
parentf519d19ce16ca899d8b8cad77c9d6501d0889993 (diff)
downloaddrakx-7594e76d93c3cc6410d222fa261d3937ddb6fc43.tar
drakx-7594e76d93c3cc6410d222fa261d3937ddb6fc43.tar.gz
drakx-7594e76d93c3cc6410d222fa261d3937ddb6fc43.tar.bz2
drakx-7594e76d93c3cc6410d222fa261d3937ddb6fc43.tar.xz
drakx-7594e76d93c3cc6410d222fa261d3937ddb6fc43.zip
(suggest): add option "quiet" to the kernel in fb (requested by chmou)
-rw-r--r--perl-install/bootloader.pm9
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 3efece178..cfa2dcc47 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -283,23 +283,24 @@ wait %d seconds for default boot.
log::l("SMP machine, but no SMP kernel found") unless $isSecure;
$isSMP = 0;
}
- add_kernel($prefix, $lilo, $kernelVersion, $isSecure ? 'secure' : $isSMP ? 'smp' : '',
+ my $entry = add_kernel($prefix, $lilo, $kernelVersion, $isSecure ? 'secure' : $isSMP ? 'smp' : '',
{
label => 'linux',
root => "/dev/$root",
- $vga_fb ? ( vga => $vga_fb) : (), #- using framebuffer
+ if_($vga_fb, vga => $vga_fb), #- using framebuffer
});
add_kernel($prefix, $lilo, $kernelVersion, '',
{
label => $isSecure || $isSMP ? 'linux-up' : 'linux-nonfb',
root => "/dev/$root",
}) if $isSecure || $isSMP || $vga_fb;
- my $entry = add_kernel($prefix, $lilo, $kernelVersion, '',
+ my $failsafe = add_kernel($prefix, $lilo, $kernelVersion, '',
{
label => 'failsafe',
root => "/dev/$root",
});
- $entry->{append} .= " failsafe" if $entry && !$lilo->{password};
+ $entry->{append} .= " quiet" if $vga_fb;
+ $failsafe->{append} .= " failsafe" if $failsafe && !$lilo->{password};
#- manage older kernel if installed.
foreach (qw(2.2 hack)) {