From 580f83e1b28af3ad9d0ff3749798a17f2ce80039 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 23 Sep 2009 17:27:49 +0000
Subject: test display manager instead of desktop when configuring autologin

---
 perl-install/any.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install/any.pm')

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}) {
-- 
cgit v1.2.1