From a59c45179d1d8c3f3788096a2cfdc52ef371c70b Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 6 Mar 2007 17:41:16 +0000 Subject: [PATCH] Added a patch from Andrew Gaffney to fix my completely broken sed for rc.conf, which caused all kinds of hell to break loose when booting a new CD. This is 2.0.3_pre3. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1221 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 ++++++ catalyst | 2 +- targets/support/livecdfs-update.sh | 5 ++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2afc2c84..f8221cd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 06 Mar 2007; Chris Gianelloni catalyst, + targets/support/livecdfs-update.sh: + Added a patch from Andrew Gaffney to fix my completely + broken sed for rc.conf, which caused all kinds of hell to break loose when + booting a new CD. This is 2.0.3_pre3. + 06 Mar 2007; Chris Gianelloni modules/generic_stage_target.py: Added a patch from Christian Heim to remove stale files, diff --git a/catalyst b/catalyst index b5de64a7..b67021a4 100755 --- a/catalyst +++ b/catalyst @@ -8,7 +8,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__version__="2.0.3_pre2" +__version__="2.0.3_pre3" conf_values={} diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 616b62c8..7eb56b23 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -143,11 +143,10 @@ fi if [ -n "${clst_livecd_xdm}" ] then sed -i \ - -e "s:DISPLAYMANAGER=\"xdm\":DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \ - -e ":^DISPLAYMANAGER: s:^#::" \ + -e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \ /etc/rc.conf sed -i \ - -e "s:DISPLAYMANAGER=\"xdm\":DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \ + -e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \ /etc/conf.d/xdm fi -- 2.26.2