[Xen-changelog] [xen-unstable] Config.mk et al: introduce XEN_LOCK_DIR

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
# Date 1285174354 -3600
# Node ID 0afdfb8b460f91cf720a3d755d71975e0f03823d
# Parent  4aac6084fdc55628cb71a0f46bc726b4c0c284ed
Config.mk et al: introduce XEN_LOCK_DIR

Introduce a OS dependent global variable XEN_LOCK_DIR that points at the
system directory that contains lock files.

[fixed up for conflict in Config.mk -iwj]

Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 Config.mk                 |    1 +
 config/NetBSD.mk          |    6 ++++++
 config/StdGNU.mk          |    2 ++
 tools/libxl/libxl.h       |    1 +
 tools/libxl/libxl_paths.c |    4 ++++
 5 files changed, 14 insertions(+)

diff -r 4aac6084fdc5 -r 0afdfb8b460f Config.mk
--- a/Config.mk Wed Sep 22 17:42:01 2010 +0100
+++ b/Config.mk Wed Sep 22 17:52:34 2010 +0100
@@ -130,6 +130,7 @@ define buildmakevars2file-closure
        echo "XENFIRMWAREDIR=\"$(XENFIRMWAREDIR)\"" >> $(1).tmp;           \
        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;               \
        if ! cmp $(1).tmp $(1); then mv -f $(1).tmp $(1); fi
 endef
 
diff -r 4aac6084fdc5 -r 0afdfb8b460f config/NetBSD.mk
--- a/config/NetBSD.mk  Wed Sep 22 17:42:01 2010 +0100
+++ b/config/NetBSD.mk  Wed Sep 22 17:52:34 2010 +0100
@@ -7,4 +7,10 @@ LIBEXEC = $(PREFIX)/libexec
 LIBEXEC = $(PREFIX)/libexec
 PRIVATE_BINDIR = $(BINDIR)
 
+ifeq ($(PREFIX),/usr)
+XEN_LOCK_DIR = /var/lib
+else
+XEN_LOCK_DIR = $(PREFIX)/var/lib
+endif
+
 WGET = ftp
diff -r 4aac6084fdc5 -r 0afdfb8b460f config/StdGNU.mk
--- a/config/StdGNU.mk  Wed Sep 22 17:42:01 2010 +0100
+++ b/config/StdGNU.mk  Wed Sep 22 17:52:34 2010 +0100
@@ -45,8 +45,10 @@ PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
 
 ifeq ($(PREFIX),/usr)
 CONFIG_DIR = /etc
+XEN_LOCK_DIR = /var/lock
 else
 CONFIG_DIR = $(PREFIX)/etc
+XEN_LOCK_DIR = $(PREFIX)/var/lock
 endif
 
 SYSCONFIG_DIR = $(CONFIG_DIR)/$(CONFIG_LEAF_DIR)
diff -r 4aac6084fdc5 -r 0afdfb8b460f tools/libxl/libxl.h
--- a/tools/libxl/libxl.h       Wed Sep 22 17:42:01 2010 +0100
+++ b/tools/libxl/libxl.h       Wed Sep 22 17:52:34 2010 +0100
@@ -508,6 +508,7 @@ const char *libxl_xenfirmwaredir_path(vo
 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);
 
 #endif /* LIBXL_H */
 
diff -r 4aac6084fdc5 -r 0afdfb8b460f tools/libxl/libxl_paths.c
--- a/tools/libxl/libxl_paths.c Wed Sep 22 17:42:01 2010 +0100
+++ b/tools/libxl/libxl_paths.c Wed Sep 22 17:52:34 2010 +0100
@@ -60,3 +60,7 @@ const char *libxl_xen_script_dir_path(vo
     return XEN_SCRIPT_DIR;
 }
 
+const char *libxl_lock_dir_path(void)
+{
+    return XEN_LOCK_DIR;
+}

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