From 63b64f0a134be8d6a054297c3d1c83571dbc91aa Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 6 Nov 1999 14:09:31 +0000
Subject: no_comment

---
 perl-install/install_steps_interactive.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'perl-install/install_steps_interactive.pm')

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);
 
-- 
cgit v1.2.1