diff options
| author | Olaf Hering <olaf@aepfle.de> | 2014-10-01 18:41:28 +0200 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2014-10-06 17:00:23 +0100 |
| commit | f049ce7bf29d15a78fb1d1d540d6ca386b9b13c5 (patch) | |
| tree | 1aa06a117adb6bf55afbb2d7f8e7c89c99c73b0a | |
| parent | 2d174ed71c6b42d6ba6f7d018a6ee8770c3cf4b0 (diff) | |
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 ]
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | m4/paths.m4 | 3 | ||||
| -rwxr-xr-x | tools/configure | 3 | ||||
| -rw-r--r-- | tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in | 2 |
4 files changed, 1 insertions, 10 deletions
@@ -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 46172cb57d..b35596ce5b 100644 --- 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 944fdbf89c..446f707865 100755 --- 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 806bcaaf65..d3470fcaa2 100644 --- 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 \ |