From: Chris Gianelloni Date: Sat, 29 Jan 2005 04:07:00 +0000 (+0000) Subject: Added killall for gconfd-2 back into livecd-stage1.sh X-Git-Tag: CATALYST_2_0_6_916~836 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4205263473d7a43af50fdf43d32b829b9c81c50c;p=catalyst.git Added killall for gconfd-2 back into livecd-stage1.sh git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@537 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 24c68eba..a3c890de 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.163 2005/01/29 04:05:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.164 2005/01/29 04:07:00 wolf31o2 Exp $ + + 28 Jan 2005; Chris Gianelloni + targets/livecd-stage1/livecd-stage1.sh: + Added killall for gconfd-2 back into livecd-stage1.sh 28 Jan 2005; Chris Gianelloni livecd/runscript/alpha-archscript.sh: diff --git a/targets/livecd-stage1/livecd-stage1.sh b/targets/livecd-stage1/livecd-stage1.sh index 1fda1177..d5a6afce 100755 --- a/targets/livecd-stage1/livecd-stage1.sh +++ b/targets/livecd-stage1/livecd-stage1.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/livecd-stage1/Attic/livecd-stage1.sh,v 1.16 2005/01/28 18:37:23 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1.sh,v 1.17 2005/01/29 04:07:00 wolf31o2 Exp $ case $1 in enter) @@ -16,6 +16,7 @@ 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