WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH] xencommons: kill xenstored when stop xencommons

To: "xen-devel@xxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxx>, Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
Subject: [Xen-devel] [PATCH] xencommons: kill xenstored when stop xencommons
From: Yu Zhiguo <yuzg@xxxxxxxxxxxxxx>
Date: Tue, 22 Jun 2010 09:35:26 +0800
Cc:
Delivery-date: Mon, 21 Jun 2010 18:36:09 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Thunderbird 3.0a1 (Windows/2008050715)
xenstored should be killed when stop xencommons.

Signed-off-by: Yu Zhiguo <yuzg@xxxxxxxxxxxxxx>

diff -r 72c6228b5f0f -r be32d4fe1e8a tools/hotplug/Linux/init.d/xencommons
--- a/tools/hotplug/Linux/init.d/xencommons     Mon Jun 21 19:19:25 2010 +0100
+++ b/tools/hotplug/Linux/init.d/xencommons     Tue Jun 22 17:39:37 2010 +0800
@@ -21,6 +21,7 @@
 
 test -f /etc/sysconfig/xencommons && . /etc/sysconfig/xencommons
 
+XENSTORED_PIDFILE=/var/run/xenstore.pid
 XENCONSOLED_PIDFILE=/var/run/xenconsoled.pid
 shopt -s extglob
 
@@ -43,7 +44,7 @@
                test -z "$XENSTORED_ROOTDIR" || 
XENSTORED_ROOTDIR="/var/lib/xenstored"
                rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null
                test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T 
/var/log/xen/xenstored-trace.log"
-               xenstored --pid-file=/var/run/xenstore.pid $XENSTORED_ARGS
+               xenstored --pid-file=$XENSTORED_PIDFILE $XENSTORED_ARGS
                xenstore-write "/local/domain/0/name" "Domain-0"
        fi
 
@@ -53,6 +54,12 @@
        test "`uname`" != "NetBSD" || xenbackendd $XENBACKENDD_ARGS
 }
 do_stop () {
+       if read 2>/dev/null <$XENSTORED_PIDFILE pid; then
+               kill $pid
+               while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done
+               rm -f $XENSTORED_PIDFILE
+       fi
+
        if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then
                kill $pid
                while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel