summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-08-28 16:37:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-08-28 16:37:14 +0000
commit471dbde330e060b2df74853c07f60d6fe5f0f65b (patch)
treef6813e78ff2b81cca3c9e2cfbffb6d8ea79607ee
parentcb0c321d6f17df8c956ceb78406a427ae42040e3 (diff)
downloaddrakx-471dbde330e060b2df74853c07f60d6fe5f0f65b.tar
drakx-471dbde330e060b2df74853c07f60d6fe5f0f65b.tar.gz
drakx-471dbde330e060b2df74853c07f60d6fe5f0f65b.tar.bz2
drakx-471dbde330e060b2df74853c07f60d6fe5f0f65b.tar.xz
drakx-471dbde330e060b2df74853c07f60d6fe5f0f65b.zip
if there is only one users and meta_class is discovery, choose autologin without asking
-rw-r--r--perl-install/any.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index da0f3eaca..5f79fbb50 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -620,7 +620,10 @@ sub autologin {
my @wm = split(' ', run_program::rooted_get_stdout($::prefix, '/usr/sbin/chksession', '-l'));
my @users = map { $_->{name} } @{$o->{users} || []};
- if (@wm > 1 && @users && !$o->{authentication}{NIS} && $o->{security} <= 2) {
+ if (member('KDE', @wm) && @users == 1 && $o->{meta_class} eq 'discovery') {
+ $o->{desktop} = 'KDE';
+ $o->{autologin} = $users[0];
+ } elsif (@wm > 1 && @users && !$o->{authentication}{NIS} && $o->{security} <= 2) {
my $use_autologin = @users == 1;
$in->ask_from_(