summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-04-03 15:32:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-04-03 15:32:32 +0000
commit6bc6cf85943742adb82a8db65bf0a268b634c198 (patch)
treea41a2b7d11f7a2a52432873fe2ac5d7548915f91
parent4ad0308a646d6d6ff38d1f8410e3ae43e0b9cabb (diff)
downloaddrakx-6bc6cf85943742adb82a8db65bf0a268b634c198.tar
drakx-6bc6cf85943742adb82a8db65bf0a268b634c198.tar.gz
drakx-6bc6cf85943742adb82a8db65bf0a268b634c198.tar.bz2
drakx-6bc6cf85943742adb82a8db65bf0a268b634c198.tar.xz
drakx-6bc6cf85943742adb82a8db65bf0a268b634c198.zip
no_comment
-rw-r--r--perl-install/install_steps_interactive.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 2362b3582..928ca4d25 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -605,8 +605,7 @@ sub setRootPassword($) {
$o->ask_from_entries_refH([_("Set root password"), _("Ok"), $o->{security} > 2 ? () : _("No password")],
[ _("Set root password"),
$::beginner ? "\n" .
-_("(a user ``mandrake'' with password ``mandrake'' has been automatically added.
-Do not use the user ``root'', except in special occasions.") : ()
+_("(an user ``mandrake'' with password ``mandrake'' has been automatically added)") : ()
], [
_("Password") => { val => \$sup->{password}, hidden => 1 },
_("Password (again)") => { val => \$sup->{password2}, hidden => 1 },
@@ -691,6 +690,9 @@ sub addUser($) {
#------------------------------------------------------------------------------
sub createBootdisk {
my ($o, $first_time) = @_;
+
+ return if $first_time && $::beginner;
+
my @l = detect_devices::floppies();
my %l = (
'fd0' => __("First floppy drive"),