From 6f1bd0f34facf22feed8ca53f9b2e67759d19306 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 8 Sep 2008 10:05:51 +0000
Subject: (set_window_manager) update /etc/sysconfig/desktop since
 get_autologin() still reads it, thus fixing drakboot not displaying previous
 setting but a blank value instead

---
 perl-install/NEWS   | 4 ++++
 perl-install/any.pm | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 63e2ab020..e79c7ccbb 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+- drakboot:
+  o update /etc/sysconfig/desktop since we read it in order to display
+    previous setting
+
 Version 11.36 - 5 September 2008
 
 - bootloader-config:
diff --git a/perl-install/any.pm b/perl-install/any.pm
index fe5458f58..8adf030a8 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -676,6 +676,10 @@ 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