summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-04-13 14:08:46 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-04-13 14:08:46 +0000
commitdd134ba8076e252e3c1782b021e63e11dd9d609c (patch)
tree42b53a9e8ab578c294ecb87c8c894f83bcf7cfdc /perl-install
parent93adc5a588e86b2aa1ff09f30a5c47dd38dd590f (diff)
downloaddrakx-backup-do-not-use-dd134ba8076e252e3c1782b021e63e11dd9d609c.tar
drakx-backup-do-not-use-dd134ba8076e252e3c1782b021e63e11dd9d609c.tar.gz
drakx-backup-do-not-use-dd134ba8076e252e3c1782b021e63e11dd9d609c.tar.bz2
drakx-backup-do-not-use-dd134ba8076e252e3c1782b021e63e11dd9d609c.tar.xz
drakx-backup-do-not-use-dd134ba8076e252e3c1782b021e63e11dd9d609c.zip
(ask_users): add the empty icon
(autologin): fix
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm14
1 files changed, 8 insertions, 6 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 87a1de74e..40cf6e275 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -737,7 +737,7 @@ sub ask_users {
{ label => _("Password (again)"), val => \$u->{password2}, hidden => 1 },
{ label => _("Shell"), val => \$u->{shell}, list => [ shells($prefix) ], not_edit => !$::expert, advanced => 1 },
if_($security <= 3,
- { label => _("Icon"), val => \$u->{icon}, list => [ facesnames($prefix) ], icon2f => sub { face2png($_[0], $prefix) }, format => \&translate },
+ { label => _("Icon"), val => \$u->{icon}, list => [ '', facesnames($prefix) ], icon2f => sub { face2png($_[0], $prefix) }, format => \&translate },
),
],
);
@@ -755,12 +755,14 @@ sub autologin {
my @wm = (split (' ', `$cmd /usr/sbin/chksession -l`));
my @users = map { $_->{name} } @{$o->{users} || []};
- if (@wm && @users && !$o->{authentication}{NIS} && $ENV{SECURE_LEVEL} <= 3) {
- $in->ask_from_entries_refH(_("Autologin"),
- _("I can set up your computer to automatically log on one user.
+ if (@wm && @users && !$o->{authentication}{NIS} && $o->{security} <= 2) {
+ add2hash_($o, { autologin => $users[0] });
+
+ $in->ask_from_entries_refH(_("Autologin"),
+ _("I can set up your computer to automatically log on one user.
If you don't want to use this feature, click on the cancel button."),
- [ { label => _("Choose the default user:"), val => \$o->{autologin}, list => [ '', @users ] },
- { label => _("Choose the window manager to run:"), val => \$o->{desktop}, list => \@wm }, ]) or delete $o->{autologin};
+ [ { label => _("Choose the default user:"), val => \$o->{autologin}, list => [ '', @users ] },
+ { label => _("Choose the window manager to run:"), val => \$o->{desktop}, list => \@wm }, ]) or delete $o->{autologin};
}
}