From: Wei Liu <wei.liu2@citrix.com>
Date: Mon, 13 Jun 2016 07:49:10 +0000 (+0100)
Subject: libxenstore: honour XEN_RUN_STORED
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~923
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=153db2f82071dcdea6540808767a1ea9b1a69c34;p=xen.git

libxenstore: honour XEN_RUN_STORED

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index d691b7811c..36b6fd4ae3 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -12,6 +12,7 @@ CFLAGS += -I./include
 CFLAGS += $(CFLAGS_libxenevtchn)
 CFLAGS += $(CFLAGS_libxenctrl)
 CFLAGS += -DXEN_LIB_STORED="\"$(XEN_LIB_STORED)\""
+CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\""
 
 CFLAGS-$(CONFIG_SYSTEMD)  += $(SYSTEMD_CFLAGS)
 LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS)
diff --git a/tools/xenstore/xs_lib.c b/tools/xenstore/xs_lib.c
index 0c7744e80e..6568e82a77 100644
--- a/tools/xenstore/xs_lib.c
+++ b/tools/xenstore/xs_lib.c
@@ -35,7 +35,7 @@ const char *xs_daemon_rootdir(void)
 const char *xs_daemon_rundir(void)
 {
 	char *s = getenv("XENSTORED_RUNDIR");
-	return (s ? s : "/var/run/xenstored");
+	return (s ? s : XEN_RUN_STORED);
 }
 
 static const char *xs_daemon_path(void)