diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2005-09-27 17:35:48 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2005-09-27 17:35:48 +0000 |
| commit | 57fe4be1648c2af2975dc56efb2aa22de344f59d (patch) | |
| tree | 2571308aedded31127315794421e94001030b75c | |
| parent | e280e685e9fb9fd7a16e41e624e31b2c3f4e75d4 (diff) | |
| download | drakx-backup-do-not-use-57fe4be1648c2af2975dc56efb2aa22de344f59d.tar drakx-backup-do-not-use-57fe4be1648c2af2975dc56efb2aa22de344f59d.tar.gz drakx-backup-do-not-use-57fe4be1648c2af2975dc56efb2aa22de344f59d.tar.bz2 drakx-backup-do-not-use-57fe4be1648c2af2975dc56efb2aa22de344f59d.tar.xz drakx-backup-do-not-use-57fe4be1648c2af2975dc56efb2aa22de344f59d.zip | |
(autologin) always show the autologing config step for globetrotter
| -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 8b3a19f8b..eef26547a 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -678,10 +678,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_( |