diff options
| author | damien <damien@mandriva.com> | 2000-09-14 00:55:40 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2000-09-14 00:55:40 +0000 |
| commit | 200bf96d09d7a36abca57bed28628a337d16c4c8 (patch) | |
| tree | 68925ae65f5356caef3575e9645e0f2dd3ea3c2b /perl-install/Xconfigurator.pm | |
| parent | 940c3448ce23ab79a27f5f7aa3b4ade436004f71 (diff) | |
| download | drakx-200bf96d09d7a36abca57bed28628a337d16c4c8.tar drakx-200bf96d09d7a36abca57bed28628a337d16c4c8.tar.gz drakx-200bf96d09d7a36abca57bed28628a337d16c4c8.tar.bz2 drakx-200bf96d09d7a36abca57bed28628a337d16c4c8.tar.xz drakx-200bf96d09d7a36abca57bed28628a337d16c4c8.zip | |
updated
Diffstat (limited to 'perl-install/Xconfigurator.pm')
| -rw-r--r-- | perl-install/Xconfigurator.pm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 2f2281954..c807cefca 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -1167,7 +1167,7 @@ Would you like X to start when you reboot?"), 1); unless ($::auto || !@users || $o->{authentication}{NIS}) { my $cmd = $prefix ? "chroot $prefix" : ""; - my @wm = map { lc } (split (' ', `$cmd /usr/sbin/chksession -l`)); + my @wm = (split (' ', `$cmd /usr/sbin/chksession -l`)); my %l = getVarsFromSh("$prefix/etc/sysconfig/autologin"); $o->{autologin} ||= $l{USER}; @@ -1178,10 +1178,9 @@ If you don't want to use this feature, click on the cancel button."), [ _("Choose the default user:") => { val => \$o->{autologin}, list => [ '', @users ] }, _("Choose the window_manager to run:") => { val => \$o->{desktop}, list => \@wm }, ]) or delete $o->{autologin}; } - if ($o->{autologin}) { - $::isStandalone ? system("urpmi --auto autologin") : $::o->pkg_install("autologin"); - any::setAutologin($prefix, $o->{autologin}, $o->{desktop}); - } + $o->{autologin} and $::isStandalone ? system("urpmi --auto autologin") : $::o->pkg_install("autologin"); + any::setAutologin($prefix, $o->{autologin}, $o->{desktop}); + run_program::rooted($prefix, "chkconfig", "--del", "gpm") if $o->{mouse}{device} =~ /ttyS/ && !$::isStandalone; } } |