[Xen-changelog] [xen-unstable] tools: Introduce XEN_RUN_DIR path.

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Anthony PERARD <anthony.perard@xxxxxxxxxx>
# Date 1309190855 -3600
# Node ID 27ea4d390e9a66a1e347c326f2a4ed1c5b21d7cf
# Parent  15fc211a13bfa911c855ddce02f3bbe291dbc037
tools: Introduce XEN_RUN_DIR path.

This patch also add libxl_run_dir_path() function in libxl.

Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r 15fc211a13bf -r 27ea4d390e9a Config.mk
--- a/Config.mk Mon Jun 27 15:18:38 2011 +0100
+++ b/Config.mk Mon Jun 27 17:07:35 2011 +0100
@@ -133,6 +133,7 @@
        echo "XEN_CONFIG_DIR=\"$(XEN_CONFIG_DIR)\"" >> $(1).tmp;           \
        echo "XEN_SCRIPT_DIR=\"$(XEN_SCRIPT_DIR)\"" >> $(1).tmp;           \
        echo "XEN_LOCK_DIR=\"$(XEN_LOCK_DIR)\"" >> $(1).tmp;               \
+       echo "XEN_RUN_DIR=\"$(XEN_RUN_DIR)\"" >> $(1).tmp;                 \
        if ! cmp $(1).tmp $(1); then mv -f $(1).tmp $(1); fi
 endef
 
diff -r 15fc211a13bf -r 27ea4d390e9a config/StdGNU.mk
--- a/config/StdGNU.mk  Mon Jun 27 15:18:38 2011 +0100
+++ b/config/StdGNU.mk  Mon Jun 27 17:07:35 2011 +0100
@@ -52,9 +52,11 @@
 ifeq ($(PREFIX),/usr)
 CONFIG_DIR = /etc
 XEN_LOCK_DIR = /var/lock
+XEN_RUN_DIR = /var/run/xen
 else
 CONFIG_DIR = $(PREFIX)/etc
 XEN_LOCK_DIR = $(PREFIX)/var/lock
+XEN_RUN_DIR = $(PREFIX)/var/run/xen
 endif
 
 SYSCONFIG_DIR = $(CONFIG_DIR)/$(CONFIG_LEAF_DIR)
diff -r 15fc211a13bf -r 27ea4d390e9a tools/libxl/Makefile
--- a/tools/libxl/Makefile      Mon Jun 27 15:18:38 2011 +0100
+++ b/tools/libxl/Makefile      Mon Jun 27 17:07:35 2011 +0100
@@ -123,6 +123,7 @@
        $(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
        $(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR)
+       $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR)
        $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR)
        $(INSTALL_PROG) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
        ln -sf libxenlight.so.$(MAJOR).$(MINOR) 
$(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR)
diff -r 15fc211a13bf -r 27ea4d390e9a tools/libxl/libxl.h
--- a/tools/libxl/libxl.h       Mon Jun 27 15:18:38 2011 +0100
+++ b/tools/libxl/libxl.h       Mon Jun 27 17:07:35 2011 +0100
@@ -529,6 +529,7 @@
 const char *libxl_xen_config_dir_path(void);
 const char *libxl_xen_script_dir_path(void);
 const char *libxl_lock_dir_path(void);
+const char *libxl_run_dir_path(void);
 
 #endif /* LIBXL_H */
 
diff -r 15fc211a13bf -r 27ea4d390e9a tools/libxl/libxl_paths.c
--- a/tools/libxl/libxl_paths.c Mon Jun 27 15:18:38 2011 +0100
+++ b/tools/libxl/libxl_paths.c Mon Jun 27 17:07:35 2011 +0100
@@ -64,3 +64,8 @@
 {
     return XEN_LOCK_DIR;
 }
+
+const char *libxl_run_dir_path(void)
+{
+    return XEN_RUN_DIR;
+}

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