summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-02-10 22:15:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-02-10 22:15:54 +0000
commit6b81dead89c722263740400d4c667fc0291b40f0 (patch)
treebb56b227aa2dd359826aa9b01c7f693363fcd994
parent90b7b7f7a18d0d319757bee4a5568f9d719655de (diff)
downloaddrakx-6b81dead89c722263740400d4c667fc0291b40f0.tar
drakx-6b81dead89c722263740400d4c667fc0291b40f0.tar.gz
drakx-6b81dead89c722263740400d4c667fc0291b40f0.tar.bz2
drakx-6b81dead89c722263740400d4c667fc0291b40f0.tar.xz
drakx-6b81dead89c722263740400d4c667fc0291b40f0.zip
in lilo.conf, "unsafe" is incompatible with "table=..." (fixes bug #1382)
-rw-r--r--perl-install/bootloader.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 809d666b8..74cc95870 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -536,10 +536,11 @@ wait %d seconds for default boot.
type => 'other',
kernel_or_dev => "/dev/$_->{device}",
label => $label . ($nbs{$label}++ ? $nbs{$label} : ''),
- if_($_->{device} =~ /[1-4]$/,
+ $_->{device} =~ /[1-4]$/ ? (
table => "/dev/$_->{rootDevice}"
- ),
+ ) : (
unsafe => 1
+ ),
})
}
}