Added sed fix for udev starting evms_activate unconditionally. This is 2.0_rc39.

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

diff --git a/ChangeLog b/ChangeLog
index f0ef74a329e70d73496c798155202965f11d5a6e..44747bbb27c3f68711bf70eddc54e0f02c87596b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.579 2006/02/17 13:34:41 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.580 2006/02/17 14:50:15 wolf31o2 Exp $
+
+  17 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/livecdfs-update.sh:
+  Added sed fix for udev starting evms_activate unconditionally. This is
+  2.0_rc39.
 
   17 Feb 2006; Eric Edgar <rocket@gentoo.org> modules/stage4_target.py:
   add stage4/unmerge stage4/rm to valid options

diff --git a/catalyst b/catalyst
index 128c1bebb8435cb41638c97dba33a7301f008c58..6505799c4b9d3e5b67222c8197db6139e1b9f55f 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python -OO
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.146 2006/02/14 15:53:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.147 2006/02/17 14:50:15 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -11,7 +11,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0_rc38"
+__version__="2.0_rc39"
 
 conf_values={}
 

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 55cdf1d9bf91b64faa1c406c31152d1b76a89963..8198e99b22517e988e6086a99d7f9bf851476455 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.37 2006/02/13 22:26:44 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.38 2006/02/17 14:50:15 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -309,3 +309,4 @@ case ${clst_livecd_type} in
                ;;
 esac
 
+sed -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh