[Xen-devel] [PATCH] Fix setting XENSTORED_ROOTDIR in xencommons

[Jim Fehlig <jfehlig@xxxxxxxx>]

# HG changeset patch
# User Jim Fehlig <jfehlig@xxxxxxxx>
# Date 1326476571 25200
# Node ID 77587801a436ce36eb291be2d1ea677249044a6e
# Parent  5b2676ac13218951698c49fa0350f2ac48220f3d
Fix setting XENSTORED_ROOTDIR in xencommons

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

    Signed-off-by: Jim Fehlig <jfehlig@xxxxxxxx>

diff -r 5b2676ac1321 -r 77587801a436 tools/hotplug/Linux/init.d/xencommons
--- a/tools/hotplug/Linux/init.d/xencommons     Mon Jan 09 16:01:44 2012 +0100
+++ b/tools/hotplug/Linux/init.d/xencommons     Fri Jan 13 10:42:51 2012 -0700
@@ -61,7 +61,7 @@ do_start () {
 
        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-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel