From 9e99199229c29dc1ffaa1539cd6e80b12e5ecb68 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Wed, 30 Nov 2016 00:30:03 -0600 Subject: [PATCH] sys-cluster/nova: fixing init for realz Package-Manager: portage-2.3.0 --- sys-cluster/nova/files/nova.initd | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/sys-cluster/nova/files/nova.initd b/sys-cluster/nova/files/nova.initd index a75a33c1fede..2edbed96fd55 100644 --- a/sys-cluster/nova/files/nova.initd +++ b/sys-cluster/nova/files/nova.initd @@ -4,14 +4,13 @@ description="Starts ${SVCNAME} service for OpenStack" -command=/usr/bin/${SVCNAME} -command_background=yes +command="/usr/bin/${SVCNAME} -- --config-file /etc/nova/nova.conf" pidfile=/var/run/nova/${SVCNAME}.pid required_files=/etc/nova/nova.conf -start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova} -- --config-file /etc/nova/nova.conf" +start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova}" if [ "$SVCNAME" == nova-compute ]; then required_files="${required_files} /etc/nova/nova-compute.conf" - start_stop_daemon_args="${start_stop_daemon_args} --config-file /etc/nova/nova-compute.conf" + command="${command} --config-file /etc/nova/nova-compute.conf" fi @@ -23,3 +22,9 @@ start_pre() { checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/run/nova} checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/lock/nova} } + +start() { + ebegin "Starting ${SVCNAME}" + start-stop-daemon -S -b -p ${pidfile} -q -u ${NOVA_USER:-nova} -x ${command} + eend $? +} -- 2.26.2