diff mbox

[12/17] libxenstore: honour XEN_RUN_STORED

Message ID 1465804155-14469-13-git-send-email-wei.liu2@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wei Liu June 13, 2016, 7:49 a.m. UTC 
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
---
 tools/xenstore/Makefile | 1 +
 tools/xenstore/xs_lib.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Comments

Ian Jackson June 13, 2016, 3:19 p.m. UTC | #1 
Wei Liu writes ("[PATCH 12/17] libxenstore: honour XEN_RUN_STORED"):
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
diff mbox

Patch

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)