summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-11-06 14:09:31 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-11-06 14:09:31 +0000
commit63b64f0a134be8d6a054297c3d1c83571dbc91aa (patch)
tree2c140a1a2cae33c573bd0ab9d86575d489bf3ccf /perl-install/install_steps_interactive.pm
parentd4c48e8a8f0c4213dc6fb0fdaa606c1f50417430 (diff)
downloaddrakx-63b64f0a134be8d6a054297c3d1c83571dbc91aa.tar
drakx-63b64f0a134be8d6a054297c3d1c83571dbc91aa.tar.gz
drakx-63b64f0a134be8d6a054297c3d1c83571dbc91aa.tar.bz2
drakx-63b64f0a134be8d6a054297c3d1c83571dbc91aa.tar.xz
drakx-63b64f0a134be8d6a054297c3d1c83571dbc91aa.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-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 09a17c9e5..752b8b8c1 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -588,7 +588,7 @@ sub setRootPassword($) {
return if $o->{security} < 1 && !$clicked;
- $o->ask_from_entries_ref([_("Set root password"), _("Ok"), _("No password")],
+ $o->ask_from_entries_ref([_("Set root password"), _("Ok"), $o->{security} > 3 ? () : _("No password")],
_("Set root password"),
[_("Password:"), _("Password (again):"), $o->{installClass} eq "server" || $::expert ? (_("Use shadow file"), _("Use MD5 passwords")) : (), $::beginner ? () : _("Use NIS") ],
[{ val => \$sup->{password}, hidden => 1 },
@@ -623,6 +623,7 @@ sub addUser($) {
my ($o, $clicked) = @_;
my $u = $o->{user} ||= $o->{security} < 1 ? { name => "mandrake", realname => "default" } : {};
$u->{password2} ||= $u->{password} ||= "";
+ $u->{shell} ||= "/bin/bash";
my @fields = qw(realname name password password2);
my @shells = install_any::shells($o);