Remove extra P_NAME definition that is never used. Saves processing time. Bumpped...

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

diff --git a/ChangeLog b/ChangeLog
index c5f1ff215b36f4fcba806c52b2a1c4b0fd69aa8c..ec8e67037d8c0ffe930627b63764101c9e0c4f15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.255 2005/05/03 14:58:51 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.256 2005/05/03 15:57:37 rocket Exp $
+
+  03 May 2005; Eric Edgar <rocket@gentoo.org> catalyst,
+  targets/support/kill-chroot-pids.sh:
+  Remove extra P_NAME definition that is never used. Saves processing time.
+  Bumped catalyst to pre2
 
   03 May 2005; Eric Edgar <rocket@gentoo.org> catalyst,
   modules/generic_stage_target.py, modules/livecd_stage2_target.py,

diff --git a/catalyst b/catalyst
index 1c2112356ec14e810f4d5792e21de60b6c1e75d9..feb86bec13a655175a9ad0c43af556328e594c39 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.78 2005/05/03 14:58:52 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.79 2005/05/03 15:57:37 rocket Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -11,7 +11,7 @@
 import os,sys,imp,string,getopt
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.0_pre1"
+__version__="2.0.0_pre2"
 
 conf_values={}
 

diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh
index f6c0be0c6ac4e7687dc03bd57aca6c3ab218a62b..9d37e3db7ac42f0d7da9261e3f7b481d6481a6b2 100755 (executable)
--- a/targets/support/kill-chroot-pids.sh
+++ b/targets/support/kill-chroot-pids.sh
@@ -24,7 +24,6 @@ do
     if [ -d /proc/$i ]
     then
        # Search for exe containing string inside ${clst_chroot_path}
-       P_NAME=$(ls -la --color=never /proc/$i 2>&1 |grep exe|grep ${clst_chroot_path}|awk '{print $11}')
        ls -la --color=never /proc/$i 2>&1 |grep exe|grep ${clst_chroot_path} > /dev/null
 
        # If found