sys-cluster/cinder: updating init again

Package-Manager: Portage-2.3.8, Repoman-2.3.3

diff --git a/sys-cluster/cinder/files/cinder.initd-2 b/sys-cluster/cinder/files/cinder.initd-2
index 8601a5869b0a4a02a9d738ef7e07e9203f07d1c8..31584dee9d237b886c79a066e8cce698ae5bb4d6 100644 (file)
--- a/sys-cluster/cinder/files/cinder.initd-2
+++ b/sys-cluster/cinder/files/cinder.initd-2
@@ -6,19 +6,12 @@ description="Starts ${SVCNAME} service for OpenStack"
 
 command=/usr/bin/${SVCNAME}
 command_background=yes
-command_args="--config-file /etc/cinder/cinder.conf --log-file /var/log/cinder/${SVCNAME}.log"
-pidfile=/var/run/cinder/${SVCNAME}.pid
+command_args="--config-file /etc/cinder/cinder.conf --log-file ${CINDER_LOGDIR:-/var/log/cinder}/${SVCNAME}.log"
+command_user="${CINDER_USER:-cinder}"
+pidfile=/run/${SVCNAME}.pid
 required_files=/etc/cinder/cinder.conf
 retry="SIGTERM/30"
 
-start_stop_daemon_args="--quiet --user ${CINDER_USER:-cinder}"
-
 depend() {
        need net
 }
-
-start_pre() {
-       checkpath --directory --owner ${CINDER_USER:-cinder}:${CINDER_GROUP:-cinder} --mode 0755 ${CINDER_RUN:-/var/run/cinder}
-  checkpath --directory --owner ${CINDER_USER:-cinder}:${CINDER_GROUP:-cinder} --mode 0755 ${CINDER_LOCK:-/var/lock/cinder}
-}
-