summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-09-23 17:27:49 +0000
committerOlivier Blin <oblin@mandriva.com>2009-09-23 17:27:49 +0000
commit580f83e1b28af3ad9d0ff3749798a17f2ce80039 (patch)
treefbc6354a89d94bd54e364cbb775383ef82c86de1 /perl-install
parent33207ecc2504b98608475a530744ab7f20ef8809 (diff)
downloaddrakx-580f83e1b28af3ad9d0ff3749798a17f2ce80039.tar
drakx-580f83e1b28af3ad9d0ff3749798a17f2ce80039.tar.gz
drakx-580f83e1b28af3ad9d0ff3749798a17f2ce80039.tar.bz2
drakx-580f83e1b28af3ad9d0ff3749798a17f2ce80039.tar.xz
drakx-580f83e1b28af3ad9d0ff3749798a17f2ce80039.zip
test display manager instead of desktop when configuring autologin
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 20bf94fd9..f34a27d13 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -693,11 +693,11 @@ sub set_autologin {
)) };
my $xdm_autologin_cfg = "$::prefix/etc/sysconfig/autologin";
- if (member($autologin->{desktop}, 'KDE', 'KDE4', 'GNOME')) {
- unlink $xdm_autologin_cfg;
- } else {
+ if ($autologin->{dm} eq 'xdm') {
setVarsInShMode($xdm_autologin_cfg, 0644,
{ USER => $autologin->{user}, AUTOLOGIN => bool2yesno($autologin->{user}), EXEC => '/usr/bin/startx.autologin' });
+ } else {
+ unlink $xdm_autologin_cfg;
}
if ($autologin->{user}) {