Make sure we setup the DISPLAYMANAGER variable in both /etc/rc.conf and /etc/conf...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1195 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 722878d364114b96bcc9f9198e301fb347a3492a..6db223f312f4de108275a407ff155833b83f9b33 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.664 2006/10/02 20:41:53 wolf31o2 Exp $
 
+  06 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/livecdfs-update.sh:
+  Make sure we setup the DISPLAYMANAGER variable in both /etc/rc.conf and
+  /etc/conf.d/xdm so we support older snapshots and newer ones.
+
   22 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/livecd_stage2_target.py:
   OK. We've fixed the spacing issue with livecd-stage2, so this is 2.0.1, for

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index cb871f04e70b35a1ab34fe6f9c989770a49ea940..694eb6d8e5877febc5ad68fa39e6a23a21f998ac 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -128,6 +128,8 @@ if [ -n "${clst_livecd_xdm}" ]
 then
        sed -i "s:#DISPLAYMANAGER=\"xdm\":DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
                /etc/rc.conf
+       sed -i "s:#DISPLAYMANAGER=\"xdm\":DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
+               /etc/conf.d/xdm
 fi
 
 # Setup configured default X Session