From d9ecc9d0896ffc5facaa758d3d5f41f243657a41 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Sat, 29 Jan 2005 14:54:31 +0000 Subject: [PATCH] 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 --- ChangeLog | 7 ++++++- targets/grp/grp-preclean-chroot.sh | 4 +--- targets/grp/grp.sh | 3 ++- targets/livecd-stage1/livecd-stage1-preclean-chroot.sh | 4 +--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f8038e0..65c1fce1 100644 --- 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 + 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 livecd/files/x86-help.msg: diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh index bec7c86b..550dd6e4 100755 --- 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 d1386873..58dc695c 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.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 bbab3e64..224fa500 100755 --- 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 -- 2.26.2