aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Fehlig <jfehlig@suse.com>2012-03-14 10:03:07 +0000
committerJim Fehlig <jfehlig@suse.com>2012-03-14 10:03:07 +0000
commit60b314e68df85d7e233d1ffcf0c27e0b38cc5b96 (patch)
treeb215d0c73795db83afb396bd96ff77923c7dd090
parent8a7c62e789cfc823a26218999a1091850f377ce7 (diff)
downloadxen-60b314e68df85d7e233d1ffcf0c27e0b38cc5b96.tar.gz
xen-60b314e68df85d7e233d1ffcf0c27e0b38cc5b96.tar.bz2
xen-60b314e68df85d7e233d1ffcf0c27e0b38cc5b96.zip
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>
-rw-r--r--tools/hotplug/Linux/init.d/xencommons2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/hotplug/Linux/init.d/xencommons b/tools/hotplug/Linux/init.d/xencommons
index f02b25dabb..6ca4ce589d 100644
--- a/tools/hotplug/Linux/init.d/xencommons
+++ b/tools/hotplug/Linux/init.d/xencommons
@@ -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"