summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-03-07 16:34:23 +0000
committerFrancois Pons <fpons@mandriva.com>2002-03-07 16:34:23 +0000
commitd47afe4be749b32a569498ce340f28d2b49e2e65 (patch)
tree026e6c99f9f99fa62f64fc64a4f89bffd84530b3
parent4ecd6b181766b6d79db68d58f8c88214f4f0ae7d (diff)
downloaddrakx-backup-do-not-use-d47afe4be749b32a569498ce340f28d2b49e2e65.tar
drakx-backup-do-not-use-d47afe4be749b32a569498ce340f28d2b49e2e65.tar.gz
drakx-backup-do-not-use-d47afe4be749b32a569498ce340f28d2b49e2e65.tar.bz2
drakx-backup-do-not-use-d47afe4be749b32a569498ce340f28d2b49e2e65.tar.xz
drakx-backup-do-not-use-d47afe4be749b32a569498ce340f28d2b49e2e65.zip
fix autologin sometimes activated without user intervention.
-rw-r--r--perl-install/any.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 097d77a34..a9987ce7e 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -821,7 +821,7 @@ sub autologin {
my @wm = (split (' ', `$cmd /usr/sbin/chksession -l 2>/dev/null`));
my @users = map { $_->{name} } @{$o->{users} || []};
- if (@wm && @users && !$o->{authentication}{NIS} && $o->{security} <= 2) {
+ if (@wm > 1 && @users && !$o->{authentication}{NIS} && $o->{security} <= 2) {
add2hash_($o, { autologin => $users[0] });
$in->ask_from_(
@@ -834,6 +834,8 @@ Do you want to use this feature?"),
{ label => _("Choose the window manager to run:"), val => \$o->{desktop}, list => \@wm } ]
)
or delete $o->{autologin};
+ } else {
+ delete $o->{autologin};
}
}