Added a conditional before killing gconfd-2. This is also going to be catalyst 1...
authorChris Gianelloni <wolf31o2@gentoo.org>
Sun, 30 Jan 2005 00:48:03 +0000 (00:48 +0000)
committerChris Gianelloni <wolf31o2@gentoo.org>
Sun, 30 Jan 2005 00:48:03 +0000 (00:48 +0000)
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@542 d1e1f19c-881f-0410-ab34-b69fee027534

ChangeLog
catalyst
targets/grp/grp.sh
targets/livecd-stage1/livecd-stage1.sh

index 65c1fce1c96b529f0ac98e4f8766298a815e2fec..85d425033aa860a5b3e547e88f3ae08ab40dea7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.168 2005/01/29 14:54:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.169 2005/01/30 00:48:03 wolf31o2 Exp $
+
+  29 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/grp/grp.sh, targets/livecd-stage1/livecd-stage1.sh:
+  Added a conditional before killing gconfd-2. This is also going to be
+  catalyst 1.1.5, so let's hope we don't find any more bugs, at least for this
+  release.
 
   29 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/grp/grp-preclean-chroot.sh, targets/grp/grp.sh,
index 4730ff0104bdf0f6f75820bbf631f2adba719c0d..2b7bd831ed3cc89e7a21b786a9c7db296a4a4839 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,14 +1,14 @@
 #!/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.61 2005/01/29 05:50:28 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.62 2005/01/30 00:48:03 wolf31o2 Exp $
 
 # Maintained in full by John Davis <zhen@gentoo.org>
 
 import os,sys,imp,string,getopt
 
 __maintainer__="John Davis <zhen@gentoo.org>"
-__version__="1.1.4"
+__version__="1.1.5"
 
 conf_values={}
 
index 58dc695ce8b1a65368ab1cff4e50b5b092f62916..75b6874417924a58cc5caca1d3a5ade6a720c08e 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.20 2005/01/29 14:54:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.21 2005/01/30 00:48:03 wolf31o2 Exp $
 
 case $1 in
        enter)
@@ -20,10 +20,13 @@ case $1 in
        ;;
 
        preclean)
-               killall -9 gconfd-2
-               cp ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh ${clst_chroot_path}/tmp
-               ${clst_CHROOT} ${clst_chroot_path} /tmp/grp-preclean-chroot.sh || exit 1
-               rm -f ${clst_chroot_path}/tmp/grp-preclean-chroot.sh
+               if [ `pidof gconfd-2` ]
+               then
+                       killall -9 gconfd-2
+               fi
+               #cp ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh ${clst_chroot_path}/tmp
+               #${clst_CHROOT} ${clst_chroot_path} /tmp/grp-preclean-chroot.sh || exit 1
+               #rm -f ${clst_chroot_path}/tmp/grp-preclean-chroot.sh
                exit 0
        ;;
 
index d5a6afce838076f585de05a3504b15f9c64f717e..d49b0637d97680da2a22c1fb868fecde6d71d7ef 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1.sh,v 1.17 2005/01/29 04:07:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1.sh,v 1.18 2005/01/30 00:48:03 wolf31o2 Exp $
 
 case $1 in
        enter)
@@ -16,10 +16,13 @@ case $1 in
        ;;
 
        preclean)
-               killall -9 gconfd-2
-               cp ${clst_sharedir}/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh ${clst_chroot_path}/tmp
-               ${clst_CHROOT} ${clst_chroot_path} /tmp/livecd-stage1-preclean-chroot.sh || exit 1
-               rm -f ${clst_chroot_path}/tmp/livecd-stage1-preclean-chroot.sh
+               if [ `pidof gconfd-2` ]
+               then
+                       killall -9 gconfd-2
+               fi
+               #cp ${clst_sharedir}/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh ${clst_chroot_path}/tmp
+               #${clst_CHROOT} ${clst_chroot_path} /tmp/livecd-stage1-preclean-chroot.sh || exit 1
+               #rm -f ${clst_chroot_path}/tmp/livecd-stage1-preclean-chroot.sh
                exit 0
        ;;