From: Olaf Hering Subject: [PATCH 40/46] Move xenwatchdogd to libexec Date: Mon, 22 Sep 2014 15:00:29 +0200 Message-ID: <1411390835-7348-41-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 xenwatchdogd is started by runlevel scripts, its not supposed to be called by admin. So move it out of the way into LIBEXEC_BIN. Signed-off-by: Olaf Hering --- tools/hotplug/Linux/init.d/xen-watchdog.in | 2 +- tools/hotplug/Linux/systemd/xen-watchdog.service.in | 2 +- tools/hotplug/NetBSD/rc.d/xen-watchdog | 2 +- tools/misc/Makefile | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/hotplug/Linux/init.d/xen-watchdog.in b/tools/hotplug/Linux/init.d/xen-watchdog.in index 32c7268..5bedb25 100644 --- a/tools/hotplug/Linux/init.d/xen-watchdog.in +++ b/tools/hotplug/Linux/init.d/xen-watchdog.in @@ -19,7 +19,7 @@ . @XEN_SCRIPT_DIR@/hotplugpath.sh -DAEMON=${SBINDIR}/xenwatchdogd +DAEMON=${LIBEXEC_BIN}/xenwatchdogd base=$(basename $DAEMON) # Source function library. diff --git a/tools/hotplug/Linux/systemd/xen-watchdog.service.in b/tools/hotplug/Linux/systemd/xen-watchdog.service.in index acb2b77..b18d4aa 100644 --- a/tools/hotplug/Linux/systemd/xen-watchdog.service.in +++ b/tools/hotplug/Linux/systemd/xen-watchdog.service.in @@ -6,7 +6,7 @@ ConditionVirtualization=xen [Service] Type=forking -ExecStart=@SBINDIR@/xenwatchdogd 30 15 +ExecStart=@LIBEXEC_BIN@/xenwatchdogd 30 15 KillSignal=USR1 [Install] diff --git a/tools/hotplug/NetBSD/rc.d/xen-watchdog b/tools/hotplug/NetBSD/rc.d/xen-watchdog index ff4a52c..090f84c 100644 --- a/tools/hotplug/NetBSD/rc.d/xen-watchdog +++ b/tools/hotplug/NetBSD/rc.d/xen-watchdog @@ -16,7 +16,7 @@ export LD_LIBRARY_PATH name="xenwatchdog" rcvar=$name -command="${SBINDIR}/xenwatchdogd" +command="${LIBEXEC_BIN}/xenwatchdogd" start_cmd="echo Starting ${name}. && PATH=${PATH}:${SBINDIR} ${command} 30 15" load_rc_config $name diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 97e3fe6..e96c1bd 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -21,12 +21,12 @@ INSTALL_BIN-$(CONFIG_X86) += xen-detect INSTALL_BIN := $(INSTALL_BIN-y) INSTALL_SBIN-y := xen-bugtool xen-python-path xenperf xenpm xen-tmem-list-parse gtraceview \ - gtracestat xenlockprof xenwatchdogd xen-ringwatch xencov + gtracestat xenlockprof xen-ringwatch xencov INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx xen-hvmcrash xen-lowmemd xen-mfndump INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool INSTALL_SBIN := $(INSTALL_SBIN-y) -INSTALL_PRIVBIN-y := xenpvnetboot +INSTALL_PRIVBIN-y := xenpvnetboot xenwatchdogd INSTALL_PRIVBIN := $(INSTALL_PRIVBIN-y) # Include configure output (config.h) to headers search path