diff -Naur mdkinst.orig/usr/bin/perl-install/install_steps.pm mdkinst/usr/bin/perl-install/install_steps.pm --- mdkinst.orig/usr/bin/perl-install/install_steps.pm Wed Dec 27 04:50:00 2000 +++ mdkinst/usr/bin/perl-install/install_steps.pm Wed Feb 21 03:51:05 2001 @@ -592,6 +592,9 @@ chomp; my %l; @l{@etc_pass_fields} = split ':'; add2hash($u, \%l); + if ($u->{password} eq ""){ + $u->{pw}=""; + } $_ = join(':', @$u{@etc_pass_fields}) . "\n"; } print F $_; diff -Naur mdkinst.orig/usr/bin/perl-install/install_steps_interactive.pm mdkinst/usr/bin/perl-install/install_steps_interactive.pm --- mdkinst.orig/usr/bin/perl-install/install_steps_interactive.pm Wed Feb 7 00:45:00 2001 +++ mdkinst/usr/bin/perl-install/install_steps_interactive.pm Wed Feb 21 05:44:52 2001 @@ -749,7 +749,7 @@ my $nis = $o->{authentication}{NIS}; $sup->{password2} ||= $sup->{password} ||= ""; - return if $o->{security} < 1 && !$clicked; +# return if $o->{security} < 1 && !$clicked; $o->set_help("setRootPassword", $o->{installClass} =~ "server" || $::expert ? "setRootPasswordMd5" : (), @@ -772,8 +772,9 @@ and $o->ask_warn('', _("This password is too simple (must be at least %d characters long)", 2 * $o->{security})), return (1,0); return 0 } - ) or return; - +# ) or return; + ); + $o->{authentication}{NIS} &&= $nis; $o->ask_from_entries_ref('', _("Authentification NIS"), @@ -790,16 +791,16 @@ sub addUser { my ($o, $clicked) = @_; my $u = $o->{user} ||= {}; - if ($o->{security} < 1) { - add2hash_($u, { name => "mandrake", password => "mandrake", realname => "default", icon => 'automagic' }); - $o->{users} ||= [ $u ]; - } +# if ($o->{security} < 1) { +# add2hash_($u, { name => "mandrake", password => "mandrake", realname => "default", icon => 'automagic' }); +# $o->{users} ||= [ $u ]; +# } $u->{password2} ||= $u->{password} ||= ""; $u->{shell} ||= "/bin/bash"; my @fields = qw(realname name password password2); my @shells = map { chomp; $_ } cat_("$o->{prefix}/etc/shells"); - if (($o->{security} >= 1 || $clicked)) { +# if (($o->{security} >= 1 || $clicked)) { $u->{icon} = translate($u->{icon}); if ($o->ask_from_entries_refH( [ _("Add user"), _("Accept user"), $o->{security} >= 4 && !@{$o->{users}} ? () : _("Done") ], @@ -834,7 +835,7 @@ $o->{user} = {}; goto &addUser; } - } +# } install_steps::addUser($o); } @@ -845,7 +846,7 @@ sub createBootdisk { my ($o, $first_time) = @_; - return if $first_time && $::beginner; +# return if $first_time && $::beginner; if (arch() =~ /sparc/) {