summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-08-28 17:54:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-08-28 17:54:55 +0000
commita1ae8148195289a08a9464eb74b9454ca997d1d3 (patch)
treed35e19bfe71b2c22b49142c84e06df86b117399c
parent471dbde330e060b2df74853c07f60d6fe5f0f65b (diff)
downloaddrakx-a1ae8148195289a08a9464eb74b9454ca997d1d3.tar
drakx-a1ae8148195289a08a9464eb74b9454ca997d1d3.tar.gz
drakx-a1ae8148195289a08a9464eb74b9454ca997d1d3.tar.bz2
drakx-a1ae8148195289a08a9464eb74b9454ca997d1d3.tar.xz
drakx-a1ae8148195289a08a9464eb74b9454ca997d1d3.zip
don't install autologin if using KDE or Gnome desktop (not needed nor used)
-rw-r--r--perl-install/install_steps.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index add08b0c5..932ae8408 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -835,7 +835,10 @@ sub addUser {
any::addUsers($users);
- $o->pkg_install("autologin") if $o->{autologin};
+ if ($o->{autologin}) {
+ $o->{desktop} ||= first(any::sessions());
+ $o->pkg_install("autologin") if !member($o->{desktop}, 'KDE', 'Gnome');
+ }
any::set_autologin($o->{autologin}, $o->{desktop});
install_any::disable_user_view() if @$users == ();