[Xen-changelog] [xen master] libxenstore: honour XEN_RUN_STORED

[patchbot@xxxxxxx]

commit 153db2f82071dcdea6540808767a1ea9b1a69c34
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Mon Jun 13 08:49:10 2016 +0100
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Fri Jun 17 11:27:21 2016 +0100

    libxenstore: honour XEN_RUN_STORED
    
    Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/xenstore/Makefile | 1 +
 tools/xenstore/xs_lib.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index d691b78..36b6fd4 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 0c7744e..6568e82 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)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog