Changing the killall -9 gconfd-2 to gconftool-2 --shutdown and resolving bug #73363.

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

diff --git a/ChangeLog b/ChangeLog
index 66f105f276839ee8c78e98e5261c3ac2032d75cc..aab812f71bd29886c000b9def0c445c2db42f31a 100644 (file)
--- 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.180 2005/03/03 22:36:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.181 2005/03/05 05:12:58 wolf31o2 Exp $
+
+  05 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> targets/grp/grp.sh,
+  targets/livecd-stage1/livecd-stage1.sh:
+  Changing the killall -9 gconfd-2 to gconftool-2 --shutdown and resolving bug
+  #73363.
 
   03 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/runscript/alpha-archscript.sh, livecd/runscript/hppa-archscript.sh,

diff --git a/targets/grp/grp.sh b/targets/grp/grp.sh
index 75b6874417924a58cc5caca1d3a5ade6a720c08e..c25ebd085779d383fbfeedd6982850b74cfdeaac 100755 (executable)
--- 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.21 2005/01/30 00:48:03 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.22 2005/03/05 05:12:58 wolf31o2 Exp $
 
 case $1 in
        enter)
@@ -22,7 +22,7 @@ case $1 in
        preclean)
                if [ `pidof gconfd-2` ]
                then
-                       killall -9 gconfd-2
+                       gconftool-2 --shutdown
                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

diff --git a/targets/livecd-stage1/livecd-stage1.sh b/targets/livecd-stage1/livecd-stage1.sh
index d04db8df7f1203d6060f6e933e67cbb6047266ec..8993d4c84e2ec01081dc645a78977cb8657928e4 100755 (executable)
--- 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.20 2005/02/28 23:40:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1.sh,v 1.21 2005/03/05 05:12:58 wolf31o2 Exp $
 
 case $1 in
        enter)
@@ -19,7 +19,7 @@ case $1 in
                GCONFD_RUNNING="`pidof gconfd-2`"
                if [ -n "${GCONFD_RUNNING}" ]
                then
-                       killall -9 gconfd-2
+                       gconftool-2 --shutdown
                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