summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-12-21 16:51:19 +0000
committerFrancois Pons <fpons@mandriva.com>1999-12-21 16:51:19 +0000
commit636afb483acfe3dd3f668b88cd484f10a8fa3e20 (patch)
treedc3514de27bd557bc57024f88ff12f28feda79ca /perl-install
parent0ed77b4d524759942d122ee37929d2b99a6f6791 (diff)
downloaddrakx-636afb483acfe3dd3f668b88cd484f10a8fa3e20.tar
drakx-636afb483acfe3dd3f668b88cd484f10a8fa3e20.tar.gz
drakx-636afb483acfe3dd3f668b88cd484f10a8fa3e20.tar.bz2
drakx-636afb483acfe3dd3f668b88cd484f10a8fa3e20.tar.xz
drakx-636afb483acfe3dd3f668b88cd484f10a8fa3e20.zip
*** empty log message ***
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/install_steps_interactive.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 39a59faf4..cc75b0285 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -371,7 +371,7 @@ sub miscellaneous {
local $ENV{LILO_PASSWORD} = $o->{lilo}{password};
run_program::rooted($o->{prefix}, "/etc/security/msec/init.sh", $o->{security});
- } 'doInstallStep';
+ } 'setupBootloader';
}
#------------------------------------------------------------------------------
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index b00ca1204..1a7dc1a48 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -625,6 +625,7 @@ _("Delay before booting default image") => \$b->{timeout},
_("Video mode") => { val => \$b->{vga}, list => [ keys %lilo::vga_modes ], not_edit => $::beginner },
$o->{security} < 4 ? () : (
_("Password") => { val => \$b->{password}, hidden => 1 },
+_("Password (again)") => { val => \$b->{password2}, hidden => 1 },
_("Restrict command line options") => { val => \$b->{restricted}, type => "bool", text => _("restrict") },
)
);
@@ -635,6 +636,7 @@ _("Restrict command line options") => { val => \$b->{restricted}, type => "bool"
complete => sub {
#- $o->{security} > 4 && length($b->{password}) < 6 and $o->ask_warn('', _("At this level of security, a password (and a good one) in lilo is requested")), return 1;
$b->{restricted} && !$b->{password} and $o->ask_warn('', _("Option ``Restrict command line options'' is of no use without a password")), return 1;
+ $b->{password} eq $b->{password2} or !$b->{restricted} or $o->ask_warn('', [ _("The passwords do not match"), _("Please try again") ]), return 1;
0;
}
) or return;