Moved killall -9 gconfd-2 to execute outside chroot.

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

diff --git a/ChangeLog b/ChangeLog
index 3f8038e06af244426f265a7f72beb020502e03f5..65c1fce1c96b529f0ac98e4f8766298a815e2fec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.167 2005/01/29 14:43:42 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.168 2005/01/29 14:54:31 wolf31o2 Exp $
+
+  29 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/grp/grp-preclean-chroot.sh, targets/grp/grp.sh,
+  targets/livecd-stage1/livecd-stage1-preclean-chroot.sh:
+  Moved killall -9 gconfd-2 to execute outside chroot.
 
   29 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/files/x86-help.msg:

diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
index bec7c86bfe02fe8c4d3f8be001f231963ba004ae..550dd6e46828d57c876a8a3ce388138440e6d29d 100755 (executable)
--- a/targets/grp/grp-preclean-chroot.sh
+++ b/targets/grp/grp-preclean-chroot.sh
@@ -1,9 +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/grp-preclean-chroot.sh,v 1.5 2005/01/28 19:36:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-preclean-chroot.sh,v 1.6 2005/01/29 14:54:31 wolf31o2 Exp $
 
 /usr/sbin/env-update
 source /etc/profile
-
-killall -9 gconfd-2

diff --git a/targets/grp/grp.sh b/targets/grp/grp.sh
index d138687343bc818eccc772b4bb7ae2af268127ec..58dc695ce8b1a65368ab1cff4e50b5b092f62916 100755 (executable)
--- a/targets/grp/grp.sh
+++ b/targets/grp/grp.sh
@@ -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.19 2005/01/28 19:36:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.20 2005/01/29 14:54:31 wolf31o2 Exp $
 
 case $1 in
        enter)
@@ -20,6 +20,7 @@ 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

diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
index bbab3e6439683d21baad97b40865283a3dab1fd8..224fa500bb8bc1b949ab9aaf4e236bc158234e8e 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
+++ b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
@@ -1,9 +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/livecd-stage1-preclean-chroot.sh,v 1.5 2005/01/28 18:37:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh,v 1.6 2005/01/29 14:54:31 wolf31o2 Exp $
 
 /usr/sbin/env-update
 source /etc/profile
-
-killall -9 gconfd-2