[Xen-changelog] [xen-4.1-testing] tools: xencommons init script: Fix setting XENSTORED_ROOTDIR

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Jim Fehlig <jfehlig@xxxxxxxx>
# Date 1331719387 0
# Node ID 93fc9441e90c679ca9edc6655b13acf174e28d2a
# Parent  0f19588760900e3428b7fec8b97b7736d71285b4
tools: xencommons init script: Fix setting XENSTORED_ROOTDIR

Due to a logic bug, XENSTORED_ROOTDIR was not being set to
default value when zero length.

Signed-off-by: Jim Fehlig <jfehlig@xxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>

xen-unstable changeset: 24593:e2722b24dc09
Backport-requested-by: Teck Choon Giam <giamteckchoon@xxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r 0f1958876090 -r 93fc9441e90c tools/hotplug/Linux/init.d/xencommons
--- a/tools/hotplug/Linux/init.d/xencommons     Tue Mar 13 16:49:03 2012 +0000
+++ b/tools/hotplug/Linux/init.d/xencommons     Wed Mar 14 10:03:07 2012 +0000
@@ -61,7 +61,7 @@
 
        if ! `xenstore-read -s / >/dev/null 2>&1`
        then
-               test -z "$XENSTORED_ROOTDIR" || 
XENSTORED_ROOTDIR="/var/lib/xenstored"
+               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"
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog