summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-03 01:24:01 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-03 01:24:01 +0000
commit519e32072f90ed17dddc56ccb74bd01f9d642dfa (patch)
tree37ad6bdcc68c3f619ddb2b57805d1ed496303a41
parent52ce91e9d3de48823520988e5f14680af67b112d (diff)
downloaddrakx-backup-do-not-use-519e32072f90ed17dddc56ccb74bd01f9d642dfa.tar
drakx-backup-do-not-use-519e32072f90ed17dddc56ccb74bd01f9d642dfa.tar.gz
drakx-backup-do-not-use-519e32072f90ed17dddc56ccb74bd01f9d642dfa.tar.bz2
drakx-backup-do-not-use-519e32072f90ed17dddc56ccb74bd01f9d642dfa.tar.xz
drakx-backup-do-not-use-519e32072f90ed17dddc56ccb74bd01f9d642dfa.zip
authentication::kind2description() has changed and its name is missleading :-(
keeping it for now and adapt install_steps_interactive::setRootPassword along what's done in drakauth
-rw-r--r--perl-install/install_steps_interactive.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 6f0e0f68e..962c59328 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1153,6 +1153,7 @@ sub setRootPassword {
$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 && !$::corporate ?
#-PO: keep this short or else the buttons will not fit in the window
@@ -1167,7 +1168,7 @@ sub setRootPassword {
} } }, [
{ label => N("Password"), val => \$sup->{password}, hidden => 1 },
{ label => N("Password (again)"), val => \$sup->{password2}, hidden => 1 },
-{ label => N("Authentication"), val => \$authentication_kind, list => [ authentication::kinds() ], format => \&authentication::kind2description, advanced => 1 },
+{ label => N("Authentication"), val => \$authentication_kind, type => 'list', list => [ authentication::kinds() ], format => \&authentication::kind2name, advanced => 1 },
]) or delete $sup->{password};
authentication::ask_parameters($o, $o->{netc}, $o->{authentication}, $authentication_kind) or goto &setRootPassword;