summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-02-16 16:34:31 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-02-16 16:34:31 +0000
commit6b46cf73703d95244bd34f4fc3429e177712e1d8 (patch)
tree8ed46ca9de4acf395e68820a04a3fa750fbdcce3 /perl-install
parentadbcd42fe7f2cbd460fb41690437e161e00109eb (diff)
downloaddrakx-6b46cf73703d95244bd34f4fc3429e177712e1d8.tar
drakx-6b46cf73703d95244bd34f4fc3429e177712e1d8.tar.gz
drakx-6b46cf73703d95244bd34f4fc3429e177712e1d8.tar.bz2
drakx-6b46cf73703d95244bd34f4fc3429e177712e1d8.tar.xz
drakx-6b46cf73703d95244bd34f4fc3429e177712e1d8.zip
(setRootPassword) do not reset auth method when pressing "previous" in next step
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps_interactive.pm4
1 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 12970008a..9584ac00b 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1165,6 +1165,10 @@ sub setRootPassword {
{ label => N("Authentication"), val => \$authentication_kind, list => [ authentication::kinds() ], format => \&authentication::kind2description, advanced => 1 },
]) or delete $sup->{password};
+ #- keep only one authentication
+ delete $o->{authentication}{$_} foreach authentication::kinds();
+ $o->{authentication}{$authentication_kind} ||= '';
+
authentication::ask_parameters($o, $o->{netc}, $o->{authentication}, $authentication_kind) or goto &setRootPassword;
}
install_steps::setRootPassword($o);