diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2005-09-27 17:35:26 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2005-09-27 17:35:26 +0000 |
| commit | 077a3aeefb57b5c9e640c9d2eb526434ff0c9369 (patch) | |
| tree | d1526ce3b9c146c8a7efc2185ca6115fdbb18b44 /perl-install/any.pm | |
| parent | 1e8d0c74c1d542053a5a99051ad791d0b2ff73b7 (diff) | |
| download | drakx-077a3aeefb57b5c9e640c9d2eb526434ff0c9369.tar drakx-077a3aeefb57b5c9e640c9d2eb526434ff0c9369.tar.gz drakx-077a3aeefb57b5c9e640c9d2eb526434ff0c9369.tar.bz2 drakx-077a3aeefb57b5c9e640c9d2eb526434ff0c9369.tar.xz drakx-077a3aeefb57b5c9e640c9d2eb526434ff0c9369.zip | |
(autologin) always show the autologing config step for globetrotter
Diffstat (limited to 'perl-install/any.pm')
| -rw-r--r-- | perl-install/any.pm | 4 |
1 files 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_( |