summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-11-30 11:35:00 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-11-30 11:35:00 +0000
commita5a0520e0bfca8ab6be9fa83dd453c9a4e8c94c5 (patch)
tree23ca265db4ca4c3299c2812f685302445040032b /perl-install/install_steps_interactive.pm
parentb6d2621f3a4a327d23d5a16247df839fca62dfec (diff)
downloaddrakx-a5a0520e0bfca8ab6be9fa83dd453c9a4e8c94c5.tar
drakx-a5a0520e0bfca8ab6be9fa83dd453c9a4e8c94c5.tar.gz
drakx-a5a0520e0bfca8ab6be9fa83dd453c9a4e8c94c5.tar.bz2
drakx-a5a0520e0bfca8ab6be9fa83dd453c9a4e8c94c5.tar.xz
drakx-a5a0520e0bfca8ab6be9fa83dd453c9a4e8c94c5.zip
- move some functions from any.pm to authentication.pm
- create authentication::ask_root_password_and_authentication() out of install_steps_interactive::setRootPassword()
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm25
1 files changed, 1 insertions, 24 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 40ab337bb..08683cd0e 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1200,30 +1200,7 @@ sub setRootPassword {
if ($o->{security} >= 1 || $clicked) {
require authentication;
- my $authentication_kind = authentication::to_kind($o->{authentication} ||= {});
-
- $o->ask_from_({
- title => N("Set root password and network authentication methods"),
- messages => N("Set root password"),
- advanced_messages => authentication::kind2description(),
- interactive_help_id => "setRootPassword",
- cancel => ($o->{security} <= 2 ?
- #-PO: keep this short or else the buttons will not fit in the window
- N("No password") : ''),
- focus_first => 1,
- callbacks => {
- complete => sub {
- $sup->{password} eq $sup->{password2} or $o->ask_warn('', [ N("The passwords do not match"), N("Please try again") ]), return 1,0;
- length $sup->{password} < 2 * $o->{security}
- and $o->ask_warn('', N("This password is too short (it must be at least %d characters long)", 2 * $o->{security})), return 1,0;
- return 0;
- } } }, [
-{ label => N("Password"), val => \$sup->{password}, hidden => 1 },
-{ label => N("Password (again)"), val => \$sup->{password2}, hidden => 1 },
-{ label => N("Authentication"), val => \$authentication_kind, type => 'list', list => [ authentication::kinds($o->{meta_class}) ], format => \&authentication::kind2name, advanced => 1 },
- ]) or delete $sup->{password};
-
- authentication::ask_parameters($o, $o->{netc}, $o->{authentication}, $authentication_kind) or goto &setRootPassword;
+ authentication::ask_root_password_and_authentication($o, $o->{netc}, $sup, $o->{authentication} ||= {}, $o->{meta_class}, $o->{security});
}
install_steps::setRootPassword($o);
}