diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-03-12 13:19:05 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-03-12 13:19:05 +0000 |
| commit | 79cb29b27f4558b659da2dc1f63800bc536ee2e6 (patch) | |
| tree | b4570d0d81ecaa088fb5efe10b4a37640007b7a6 | |
| parent | 17f6b7e4d5cedf1588a30f18bf4cc3df2b1df7e4 (diff) | |
| download | drakx-backup-do-not-use-79cb29b27f4558b659da2dc1f63800bc536ee2e6.tar drakx-backup-do-not-use-79cb29b27f4558b659da2dc1f63800bc536ee2e6.tar.gz drakx-backup-do-not-use-79cb29b27f4558b659da2dc1f63800bc536ee2e6.tar.bz2 drakx-backup-do-not-use-79cb29b27f4558b659da2dc1f63800bc536ee2e6.tar.xz drakx-backup-do-not-use-79cb29b27f4558b659da2dc1f63800bc536ee2e6.zip | |
don't have "quiet" boot in the server meta_class
| -rw-r--r-- | perl-install/bootloader.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 06f457dd4..3db8b0938 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -303,7 +303,7 @@ sub get_kernels_and_labels { } sub suggest { - my ($prefix, $lilo, $hds, $fstab, $vga_fb) = @_; + my ($prefix, $lilo, $hds, $fstab, $vga_fb, $quiet) = @_; my $root_part = fsedit::get_root($fstab); my $root = isLoopback($root_part) ? "loop7" : $root_part->{device}; my $boot = fsedit::get_root($fstab, 'boot')->{device}; @@ -380,7 +380,7 @@ wait %d seconds for default boot. { if_($vga_fb && $ext eq '', vga => $vga_fb), #- using framebuffer }); - $entry->{append} .= " quiet" if $vga_fb && $version !~ /smp|enterprise/; + $entry->{append} .= " quiet" if $vga_fb && $version !~ /smp|enterprise/ && $quiet; if ($vga_fb && $ext eq '') { add_kernel($prefix, $lilo, $version, $ext, $root, { label => 'linux-nonfb' }); diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 838fdde6b..0bfa4a2ba 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -834,7 +834,7 @@ sub setupBootloaderBefore { $p && pkgs::packageFlagInstalled($p); } 'Aurora', 'bootsplash'; bootloader::suggest($o->{prefix}, $o->{bootloader}, $o->{all_hds}{hds}, $o->{fstab}, - ($force_vga || $vga && $need_fb) && $o->{vga}); + ($force_vga || $vga && $need_fb) && $o->{vga}, $o->{meta_class} ne 'server'); bootloader::suggest_floppy($o->{bootloader}) if $o->{security} <= 3 && arch() !~ /ppc/; $o->{bootloader}{keytable} ||= keyboard::keyboard2kmap($o->{keyboard}); |