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 d691b7811cb3bd199a3ff8bf781afa58e0e38577..36b6fd4ae39458852d0a8c765619cb500140a387 100644 (file)
--- 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 0c7744e80ea60599a6556f8665b348ff38ef73ca..6568e82a779029e45dd716a0d90c986fdf81c0e0 100644 (file)
--- 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)