summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-02-03 23:26:48 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-02-03 23:26:48 +0000
commite5db62489ae879526ffbe1c0eaa36f1ec05b748e (patch)
tree03898eacc9ef443d494750a8c48db309b3fe8e62
parentf1f5c4a32758b99f60bbb3634fc9fb01308d693d (diff)
downloaddrakx-backup-do-not-use-e5db62489ae879526ffbe1c0eaa36f1ec05b748e.tar
drakx-backup-do-not-use-e5db62489ae879526ffbe1c0eaa36f1ec05b748e.tar.gz
drakx-backup-do-not-use-e5db62489ae879526ffbe1c0eaa36f1ec05b748e.tar.bz2
drakx-backup-do-not-use-e5db62489ae879526ffbe1c0eaa36f1ec05b748e.tar.xz
drakx-backup-do-not-use-e5db62489ae879526ffbe1c0eaa36f1ec05b748e.zip
"password" works without "restricted", not the other way round (reported by David Eastcott)
-rw-r--r--perl-install/bootloader.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index ce5c521a1..bf7683baa 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -703,10 +703,13 @@ sub write_lilo_conf {
open F, ">$f" or die "cannot create lilo config file: $f";
log::l("writing lilo config to $f");
+ #- normalize: RESTRICTED is only valid if PASSWORD is set
+ delete $lilo->{restricted} if !$lilo->{password};
+
local $lilo->{default} = make_label_lilo_compatible($lilo->{default});
$lilo->{$_} and print F "$_=$lilo->{$_}" foreach qw(boot map install vga default append keytable);
$lilo->{$_} and print F $_ foreach qw(linear lba32 compact prompt restricted);
- print F "password=", $lilo->{password} if $lilo->{restricted} && $lilo->{password}; #- also done by msec
+ print F "password=", $lilo->{password} if $lilo->{password}; #- also done by msec
print F "timeout=", round(10 * $lilo->{timeout}) if $lilo->{timeout};
print F "serial=", $1 if get_append($lilo, 'console') =~ /ttyS(.*)/;