From: Chris Gianelloni Date: Wed, 6 Dec 2006 21:39:38 +0000 (+0000) Subject: Make sure we setup the DISPLAYMANAGER variable in both /etc/rc.conf and /etc/conf... X-Git-Tag: CATALYST_2_0_6_916~299 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4b53026afba46899c031d28c660cf770fb22f114;p=catalyst.git 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. 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 722878d3..6db223f3 100644 --- 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 + 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 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 cb871f04..694eb6d8 100755 --- 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