xcp-1.6-updates/xen-4.1.hg

changeset 23266:93fc9441e90c

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@suse.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

xen-unstable changeset: 24593:e2722b24dc09
Backport-requested-by: Teck Choon Giam <giamteckchoon@gmail.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
author Jim Fehlig <jfehlig@suse.com>
date Wed Mar 14 10:03:07 2012 +0000 (2012-03-14)
parents 0f1958876090
children 14416d8215d4
files tools/hotplug/Linux/init.d/xencommons
line diff
     1.1 --- a/tools/hotplug/Linux/init.d/xencommons	Tue Mar 13 16:49:03 2012 +0000
     1.2 +++ b/tools/hotplug/Linux/init.d/xencommons	Wed Mar 14 10:03:07 2012 +0000
     1.3 @@ -61,7 +61,7 @@ do_start () {
     1.4  
     1.5  	if ! `xenstore-read -s / >/dev/null 2>&1`
     1.6  	then
     1.7 -		test -z "$XENSTORED_ROOTDIR" || XENSTORED_ROOTDIR="/var/lib/xenstored"
     1.8 +		test -z "$XENSTORED_ROOTDIR" && XENSTORED_ROOTDIR="/var/lib/xenstored"
     1.9  		rm -f "$XENSTORED_ROOTDIR"/tdb* &>/dev/null
    1.10  		test -z "$XENSTORED_TRACE" || XENSTORED_ARGS=" -T /var/log/xen/xenstored-trace.log"
    1.11