tools/hotplug: Use XEN_RUN_DIR instead of /var/run/xen

Also remove duplicate XEN_RUN_DIR from m4/paths.m4.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
[ ijc -- ran autogen.sh as requested ]

diff --git a/configure b/configure
index de6703793dbe13a40c61b304d52dee5e598722cf..9020df3aa9f8016ec4c7550a263e78c38f712965 100755 (executable)
--- a/configure
+++ b/configure
@@ -1961,9 +1961,6 @@ case "$host_os" in
 esac
 
 
-XEN_RUN_DIR=$localstatedir/run/xen
-
-
 XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging
 
 

diff --git a/m4/paths.m4 b/m4/paths.m4
index 46172cb57da9a10a0542b41a907b52a65b99fe34..b35596ce5b5b58f41f63d5a0993b8999f1c11b28 100644 (file)
--- a/m4/paths.m4
+++ b/m4/paths.m4
@@ -108,9 +108,6 @@ case "$host_os" in
 esac
 AC_SUBST(XEN_LOCK_DIR)
 
-XEN_RUN_DIR=$localstatedir/run/xen
-AC_SUBST(XEN_RUN_DIR)
-
 XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging
 AC_SUBST(XEN_PAGING_DIR)
 ])

diff --git a/tools/configure b/tools/configure
index 944fdbf89c5b9938d916aaf7529996d2db5eebdf..446f7078651f61cc41efc1542f6d30ea163d6876 100755 (executable)
--- a/tools/configure
+++ b/tools/configure
@@ -3805,9 +3805,6 @@ case "$host_os" in
 esac
 
 
-XEN_RUN_DIR=$localstatedir/run/xen
-
-
 XEN_PAGING_DIR=$localstatedir/lib/xen/xenpaging
 
 

diff --git a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in
index 806bcaaf65450deac982d7e3f047e8d3c74494f6..d3470fcaa212f403da426a91457319de2e51c867 100644 (file)
--- a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in
+++ b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in
@@ -12,7 +12,7 @@ EnvironmentFile=-/etc/default/xenstored
 EnvironmentFile=-/etc/sysconfig/xenstored
 PIDFile=@XEN_RUN_DIR@/qemu-dom0.pid
 ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
-ExecStartPre=/bin/mkdir -p /var/run/xen
+ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@
 ExecStart=@LIBEXEC_BIN@/qemu-system-i386 -xen-domid 0 \
        -xen-attach -name dom0 -nographic -M xenpv -daemonize \
        -monitor /dev/null -serial /dev/null -parallel /dev/null \