From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Fri, 28 Jan 2005 19:36:49 +0000 (+0000)
Subject: Re-enabled preclean in grp and added gconfd-2 killing.
X-Git-Tag: CATALYST_2_0_6_916~841
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=efa9e148ac2fc37de1872d50573408f0b7a7f112;p=catalyst.git

Re-enabled preclean in grp and added gconfd-2 killing.


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

diff --git a/ChangeLog b/ChangeLog
index 3e06f170..731f313c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.158 2005/01/28 19:23:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.159 2005/01/28 19:36:49 wolf31o2 Exp $
+
+  28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/grp/grp-preclean-chroot.sh, targets/grp/grp.sh:
+  Re-enabled preclean in grp and added gconfd-2 killing.
 
   28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/runscript/x86-archscript.sh:
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
index ae497e6a..bec7c86b 100755
--- a/targets/grp/grp-preclean-chroot.sh
+++ b/targets/grp/grp-preclean-chroot.sh
@@ -1,7 +1,9 @@
 #!/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.4 2004/10/15 02:46:58 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-preclean-chroot.sh,v 1.5 2005/01/28 19:36:49 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 1e74017b..d1386873 100755
--- 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.18 2004/10/15 02:46:58 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.19 2005/01/28 19:36:49 wolf31o2 Exp $
 
 case $1 in
 	enter)
@@ -20,9 +20,9 @@ case $1 in
 	;;
 
 	preclean)
-		#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
+		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
 	;;