summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-09-17 11:01:41 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-09-17 11:01:41 +0000
commitad78b8e39cf20d8962eb1b594844d6c36df8bf53 (patch)
tree9fd1b7331b6ff0f2fd69edeca4ea9cda77e3fa2a
parent711e935d8e689d3b4f62ec215513323498953636 (diff)
downloaddrakx-ad78b8e39cf20d8962eb1b594844d6c36df8bf53.tar
drakx-ad78b8e39cf20d8962eb1b594844d6c36df8bf53.tar.gz
drakx-ad78b8e39cf20d8962eb1b594844d6c36df8bf53.tar.bz2
drakx-ad78b8e39cf20d8962eb1b594844d6c36df8bf53.tar.xz
drakx-ad78b8e39cf20d8962eb1b594844d6c36df8bf53.zip
cancel in setRootPassword means "No password", not cancel
-rw-r--r--perl-install/install_steps_interactive.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index f57c78c6b..7ba215815 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1144,7 +1144,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 => [ any::authentication_kinds() ], format => \&any::authentication_kind2description, advanced => 1 },
- ]) or return;
+ ]) or delete $sup->{password};
any::ask_authentification_parameters($o, $o->{netc}, $o->{authentication}, $authentication_kind) or goto &setRootPassword;
}