From 98339b80a0e45545dd3aa55c5110eb9ae9e6d918 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Sun, 30 Jan 2005 00:48:03 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@542 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 +++++++- catalyst | 4 ++-- targets/grp/grp.sh | 13 ++++++++----- targets/livecd-stage1/livecd-stage1.sh | 13 ++++++++----- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65c1fce1..85d42503 100644 --- 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 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 targets/grp/grp-preclean-chroot.sh, targets/grp/grp.sh, diff --git a/catalyst b/catalyst index 4730ff01..2b7bd831 100755 --- 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 import os,sys,imp,string,getopt __maintainer__="John Davis " -__version__="1.1.4" +__version__="1.1.5" conf_values={} diff --git a/targets/grp/grp.sh b/targets/grp/grp.sh index 58dc695c..75b68744 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.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 ;; diff --git a/targets/livecd-stage1/livecd-stage1.sh b/targets/livecd-stage1/livecd-stage1.sh index d5a6afce..d49b0637 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.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 ;; -- 2.26.2