From 14899e18b71931cfdff94b4ee1e5d69c504a7a44 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 23 Sep 2009 17:29:32 +0000
Subject: always write /etc/sysconfig/desktop

---
 perl-install/any.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/perl-install/any.pm b/perl-install/any.pm
index e4a69ec9d..be9cf994c 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -700,6 +700,11 @@ sub set_autologin {
 	unlink $xdm_autologin_cfg;
     }
 
+    my $sys_conffile = "$::prefix/etc/sysconfig/desktop";
+    my %desktop = getVarsFromSh($sys_conffile);
+    $desktop{DESKTOP} = $autologin->{desktop};
+    setVarsInSh($sys_conffile, \%desktop);
+
     if ($autologin->{user}) {
 	my $home = (getpwnam($autologin->{user}))[7];
 	set_window_manager($home, $autologin->{desktop});
@@ -723,10 +728,6 @@ sub set_window_manager {
 	$l{DESKTOP} = $wm;
 	setVarsInSh("$p_home/.desktop", \%l);
     }
-    my $sys_conffile = "$::prefix/etc/sysconfig/desktop";
-    my %desktop = getVarsFromSh($sys_conffile);
-    $desktop{DESKTOP} = $wm;
-    setVarsInSh($sys_conffile, \%desktop);
 }
 
 sub rotate_log {
-- 
cgit v1.2.1