diff options
| author | Anthony PERARD <anthony.perard@citrix.com> | 2011-06-27 17:07:35 +0100 |
|---|---|---|
| committer | Anthony PERARD <anthony.perard@citrix.com> | 2011-06-27 17:07:35 +0100 |
| commit | 3182373aa4595b773b40b66b8931a6549caec13c (patch) | |
| tree | cd0efd4d39237669952c754a02823ada68cb6abd | |
| parent | 9b660e230a2d9074b8814d979bba27f03d9be12d (diff) | |
| download | xen-3182373aa4595b773b40b66b8931a6549caec13c.tar.gz xen-3182373aa4595b773b40b66b8931a6549caec13c.tar.bz2 xen-3182373aa4595b773b40b66b8931a6549caec13c.zip | |
tools: Introduce XEN_RUN_DIR path.
This patch also add libxl_run_dir_path() function in libxl.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
| -rw-r--r-- | Config.mk | 1 | ||||
| -rw-r--r-- | config/StdGNU.mk | 2 | ||||
| -rw-r--r-- | tools/libxl/Makefile | 1 | ||||
| -rw-r--r-- | tools/libxl/libxl.h | 1 | ||||
| -rw-r--r-- | tools/libxl/libxl_paths.c | 5 |
5 files changed, 10 insertions, 0 deletions
@@ -133,6 +133,7 @@ define buildmakevars2file-closure 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 --git a/config/StdGNU.mk b/config/StdGNU.mk index 25aeb4d819..68fa226884 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -52,9 +52,11 @@ PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin 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 --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 77724b3b77..bfe9c5886d 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -123,6 +123,7 @@ install: all $(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 --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index b8392b7fad..da878e43b5 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -529,6 +529,7 @@ const char *libxl_xenfirmwaredir_path(void); 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 --git a/tools/libxl/libxl_paths.c b/tools/libxl/libxl_paths.c index 9c2bd060b9..192501f7ee 100644 --- a/tools/libxl/libxl_paths.c +++ b/tools/libxl/libxl_paths.c @@ -64,3 +64,8 @@ const char *libxl_lock_dir_path(void) { return XEN_LOCK_DIR; } + +const char *libxl_run_dir_path(void) +{ + return XEN_RUN_DIR; +} |