From: Olaf Hering Subject: [PATCH 38/46] Move xenconsoled to libexec Date: Mon, 22 Sep 2014 15:00:27 +0200 Message-ID: <1411390835-7348-39-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 xenconsoled 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/console/Makefile | 3 +-- tools/hotplug/FreeBSD/rc.d/xencommons.in | 6 +++--- tools/hotplug/Linux/init.d/xencommons.in | 2 +- tools/hotplug/Linux/systemd/xenconsoled.service.in | 2 +- tools/hotplug/NetBSD/rc.d/xencommons | 6 +++--- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tools/console/Makefile b/tools/console/Makefile index 6e55618..fc3af74 100644 --- a/tools/console/Makefile +++ b/tools/console/Makefile @@ -30,9 +30,8 @@ xenconsole: $(patsubst %.c,%.o,$(wildcard client/*.c)) .PHONY: install install: $(BIN) - $(INSTALL_DIR) $(DESTDIR)/$(SBINDIR) - $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(SBINDIR) $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(LIBEXEC_BIN) $(INSTALL_PROG) xenconsole $(DESTDIR)$(LIBEXEC_BIN) -include $(DEPS) diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons.in b/tools/hotplug/FreeBSD/rc.d/xencommons.in index c73616e..88ff5b0 100644 --- a/tools/hotplug/FreeBSD/rc.d/xencommons.in +++ b/tools/hotplug/FreeBSD/rc.d/xencommons.in @@ -60,7 +60,7 @@ xen_startcmd() XENCONSOLED_ARGS="${XENCONSOLED_ARGS} --log=${XENCONSOLED_TRACE}" fi - ${SBINDIR}/xenconsoled ${XENCONSOLED_ARGS} + ${LIBEXEC_BIN}/xenconsoled ${XENCONSOLED_ARGS} printf "\n" @@ -74,7 +74,7 @@ xen_stop() printf "Stopping xencommons.\n" printf "WARNING: Not stopping xenstored, as it cannot be restarted.\n" - rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) + rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${LIBEXEC_BIN}/xenconsoled) pids="$pids $rc_pid" kill -${sig_stop:-TERM} $pids @@ -88,7 +88,7 @@ xen_status() pids="$pids $xenstored_pid" fi - xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) + xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${LIBEXEC_BIN}/xenconsoled) if test -n ${xenconsoled_pid}; then pids="$pids $xenconsoled_pid" fi diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in index 10edf29..6595fbf 100644 --- a/tools/hotplug/Linux/init.d/xencommons.in +++ b/tools/hotplug/Linux/init.d/xencommons.in @@ -100,7 +100,7 @@ do_start () { echo Starting xenconsoled... test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE" - ${SBINDIR}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS + ${LIBEXEC_BIN}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS echo Starting QEMU as disk backend for dom0 test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC_BIN}/qemu-system-i386" $QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize \ diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in b/tools/hotplug/Linux/systemd/xenconsoled.service.in index 15fad35..0aa34fa 100644 --- a/tools/hotplug/Linux/systemd/xenconsoled.service.in +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in @@ -14,7 +14,7 @@ EnvironmentFile=-/etc/sysconfig/xenconsoled PIDFile=@XEN_RUN_DIR@/xenconsoled.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p ${XENCONSOLED_LOG_DIR} -ExecStart=@SBINDIR@/xenconsoled --pid-file @XEN_RUN_DIR@/xenconsoled.pid --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS +ExecStart=@LIBEXEC_BIN@/xenconsoled --pid-file @XEN_RUN_DIR@/xenconsoled.pid --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS [Install] WantedBy=multi-user.target diff --git a/tools/hotplug/NetBSD/rc.d/xencommons b/tools/hotplug/NetBSD/rc.d/xencommons index 793bede..16ec79b 100644 --- a/tools/hotplug/NetBSD/rc.d/xencommons +++ b/tools/hotplug/NetBSD/rc.d/xencommons @@ -64,7 +64,7 @@ xen_startcmd() XENCONSOLED_ARGS="${XENCONSOLED_ARGS} --log=${XENCONSOLED_TRACE}" fi - ${SBINDIR}/xenconsoled ${XENCONSOLED_ARGS} + ${LIBEXEC_BIN}/xenconsoled ${XENCONSOLED_ARGS} printf "\n" @@ -78,7 +78,7 @@ xen_stop() printf "Stopping xencommons.\n" printf "WARNING: Not stopping xenstored, as it cannot be restarted.\n" - rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) + rc_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${LIBEXEC_BIN}/xenconsoled) pids="$pids $rc_pid" kill -${sig_stop:-TERM} $pids @@ -92,7 +92,7 @@ xen_status() pids="$pids $xenstored_pid" fi - xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${SBINDIR}/xenconsoled) + xenconsoled_pid=$(check_pidfile ${XENCONSOLED_PIDFILE} ${LIBEXEC_BIN}/xenconsoled) if test -n ${xenconsoled_pid}; then pids="$pids $xenconsoled_pid" fi