summaryrefslogtreecommitdiffstats
path: root/perl-install/bootloader.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-15 20:42:47 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-15 20:42:47 +0000
commit851338fe8bf4c8d057984431b542b333cbad4b8e (patch)
tree7029da4dde591025d410100a9b1b126967ba2f76 /perl-install/bootloader.pm
parent91608779ad460d1481bec34e39db4661b4950441 (diff)
downloaddrakx-backup-do-not-use-851338fe8bf4c8d057984431b542b333cbad4b8e.tar
drakx-backup-do-not-use-851338fe8bf4c8d057984431b542b333cbad4b8e.tar.gz
drakx-backup-do-not-use-851338fe8bf4c8d057984431b542b333cbad4b8e.tar.bz2
drakx-backup-do-not-use-851338fe8bf4c8d057984431b542b333cbad4b8e.tar.xz
drakx-backup-do-not-use-851338fe8bf4c8d057984431b542b333cbad4b8e.zip
no_comment
Diffstat (limited to 'perl-install/bootloader.pm')
-rw-r--r--perl-install/bootloader.pm7
1 files changed, 3 insertions, 4 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index ffde61d6a..0c4659015 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -249,17 +249,16 @@ 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' : 'smp',
+ add_kernel($prefix, $lilo, $kernelVersion, $isSecure ? 'secure' : $isSMP ? 'smp' : '',
{
label => 'linux',
root => "/dev/$root",
$vga_fb ? ( vga => $vga_fb) : (), #- using framebuffer
- }) if $isSecure || $isSMP;
+ });
add_kernel($prefix, $lilo, $kernelVersion, '',
{
- label => $isSecure || $isSMP ? 'linux-up' : 'linux',
+ label => $isSecure || $isSMP ? 'linux-up' : 'linux-nonfb',
root => "/dev/$root",
- $vga_fb ? ( vga => $vga_fb) : (), #- using framebuffer
});
add_kernel($prefix, $lilo, $kernelVersion, '',
{