# 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 <wolf31o2@gentoo.org> 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 <wolf31o2@gentoo.org>
targets/grp/grp-preclean-chroot.sh, targets/grp/grp.sh,
#!/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 <zhen@gentoo.org>
import os,sys,imp,string,getopt
__maintainer__="John Davis <zhen@gentoo.org>"
-__version__="1.1.4"
+__version__="1.1.5"
conf_values={}
#!/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)
;;
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
;;
#!/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)
;;
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
;;