From 077a3aeefb57b5c9e640c9d2eb526434ff0c9369 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 27 Sep 2005 17:35:26 +0000 Subject: (autologin) always show the autologing config step for globetrotter --- perl-install/any.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-install/any.pm b/perl-install/any.pm index 61fba0805..aad4d3a93 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -693,10 +693,10 @@ sub autologin { my @wm = sessions(); my @users = map { $_->{name} } @{$o->{users} || []}; - if (member('KDE', @wm) && @users == 1 && $o->{meta_class} eq 'desktop') { + if (!$::globetrotter && member('KDE', @wm) && @users == 1 && $o->{meta_class} eq 'desktop') { $o->{desktop} = 'KDE'; $o->{autologin} = $users[0]; - } elsif (@wm > 1 && @users && !$o->{authentication}{NIS} && $o->{security} <= 2) { + } elsif ($::globetrotter || @wm > 1 && @users && !$o->{authentication}{NIS} && $o->{security} <= 2) { my $use_autologin = $::globetrotter || @users == 1; $in->ask_from_( -- cgit v1.2.1