summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-08 10:05:51 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-08 10:05:51 +0000
commit6f1bd0f34facf22feed8ca53f9b2e67759d19306 (patch)
tree7d1d42b179486cb6b3e12a6a48447bd32599e77d /perl-install
parent26f52a281e0d15bc624d03eccd77015d2460765d (diff)
downloaddrakx-6f1bd0f34facf22feed8ca53f9b2e67759d19306.tar
drakx-6f1bd0f34facf22feed8ca53f9b2e67759d19306.tar.gz
drakx-6f1bd0f34facf22feed8ca53f9b2e67759d19306.tar.bz2
drakx-6f1bd0f34facf22feed8ca53f9b2e67759d19306.tar.xz
drakx-6f1bd0f34facf22feed8ca53f9b2e67759d19306.zip
(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
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS4
-rw-r--r--perl-install/any.pm4
2 files changed, 8 insertions, 0 deletions
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 {