From: Olaf Hering Subject: [PATCH 42/46] Use XEN_RUN_DIR instead of /var/run/xen Date: Mon, 22 Sep 2014 15:00:31 +0200 Message-ID: <1411390835-7348-43-git-send-email-olaf@aepfle.de> References: <1411390835-7348-1-git-send-email-olaf@aepfle.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1411390835-7348-1-git-send-email-olaf@aepfle.de> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Olaf Hering , Keir Fraser , David Scott , Stefano Stabellini , George Dunlap , Tim Deegan , Ian Jackson , Jan Beulich , Samuel Thibault , Ian Campbell List-Id: xen-devel@lists.xenproject.org Also remove duplicate XEN_RUN_DIR from m4/paths.m4. Fix XEN_RUN_DIR expansion in toplevel Makefile Signed-off-by: Olaf Hering --- Makefile | 2 +- m4/paths.m4 | 3 --- tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7558262..b0742cf 100644 --- a/Makefile +++ b/Makefile @@ -221,7 +221,7 @@ uninstall: rm -f $(D)$(XEN_SYSTEMD_DIR)/*.service rm -f $(D)$(XEN_SYSTEMD_DIR)/*.mount rm -f $(D)$(XEN_SYSTEMD_MODULES_LOAD)/*.conf - rm -rf $(D)$(XEN_RUN_DIR)* $(D)/var/lib/xen* + rm -rf $(D)$(XEN_RUN_DIR)/* $(D)/var/lib/xen* make -C tools uninstall rm -rf $(D)/boot/tboot* diff --git a/m4/paths.m4 b/m4/paths.m4 index f89378c..965a1d4 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -122,9 +122,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/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in index 806bcaa..d3470fc 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 \