summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-04-05 20:59:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-04-05 20:59:42 +0000
commit363aab7a71a0b505c780b763b22bcd5131995382 (patch)
treeec5940d21c5c321661d981e03a70ab388b183766 /perl-install/install_steps_interactive.pm
parentc3de4c115afa51c96bdd3684644cae2176f015b4 (diff)
downloaddrakx-363aab7a71a0b505c780b763b22bcd5131995382.tar
drakx-363aab7a71a0b505c780b763b22bcd5131995382.tar.gz
drakx-363aab7a71a0b505c780b763b22bcd5131995382.tar.bz2
drakx-363aab7a71a0b505c780b763b22bcd5131995382.tar.xz
drakx-363aab7a71a0b505c780b763b22bcd5131995382.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm13
1 files changed, 9 insertions, 4 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d089797c1..746f4ac66 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -651,10 +651,13 @@ _("Use NIS") => { val => \$o->{authentication}{NIS}, type => 'bool', text => _("
#------------------------------------------------------------------------------
sub addUser {
my ($o, $clicked) = @_;
- my $u = $o->{user} ||= $o->{security} < 1 ? { name => "mandrake", password => "mandrake", realname => "default" } : {};
+ my $u = $o->{user} ||= {};
+ if ($::beginner || $o->{security} < 1) {
+ add2hash_($u, { name => "mandrake", password => "mandrake", realname => "default" });
+ $o->{users} ||= [ $u ];
+ }
$u->{password2} ||= $u->{password} ||= "";
$u->{shell} ||= "/bin/bash";
- $u->{icon} ||= translate('default');
my @fields = qw(realname name password password2);
my @shells = install_any::shells($o);
@@ -929,9 +932,11 @@ _("Removable media automounting") => { val => \$o->{useSupermount}, type => 'boo
$::expert ? (
_("Clean /tmp at each boot") => { val => \$u->{CLEAN_TMP}, type => 'bool' },
) : (),
- $u->{numlock} ? (
+ $o->{pcmcia} ? (
+_("Enable multi profiles") => { val => \$u->{profiles}, type => 'bool' },
+ ) : (
_("Enable num lock at startup") => { val => \$u->{numlock}, type => 'bool' },
- ) : (),
+ ),
], complete => sub {
!$u->{memsize} || $u->{memsize} =~ s/^(\d+)M?$/$1M/i or $o->ask_warn('', _("Give the ram size in Mb")), return 1;
my %m = reverse %l; $ENV{SECURE_LEVEL} = $o->{security} = $m{$s};