Added a patch from Andrew Gaffney <agaffney@gentoo.org> to fix my completely broken...

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

diff --git a/ChangeLog b/ChangeLog
index 2afc2c84ec333e346515b23ea4fcdbbdb649dc64..f8221cd45f7eb7877299aa00139dd1653b339eaa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  06 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/livecdfs-update.sh:
+  Added a patch from Andrew Gaffney <agaffney@gentoo.org> 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 <wolf31o2@gentoo.org>
   modules/generic_stage_target.py:
   Added a patch from Christian Heim <phreak@gentoo.org> to remove stale files,

diff --git a/catalyst b/catalyst
index b5de64a72c9491103e67900e5f7b40a1350fb0cf..b67021a4c418cfeaaf28d4d06f01f0f18181d600 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__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 616b62c885d22e1dc207b2e8118fff26aca33751..7eb56b23c1180845c6385a82eb2fa388d892d51f 100755 (executable)
--- 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