commit: 8cf8f2203ea4ce5f07d7a0f06dff9f60850c8a04
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 18 04:33:36 2017 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 04:55:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cf8f220
sys-cluster/cinder: updating init again
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sys-cluster/cinder/files/cinder.initd-2 | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/sys-cluster/cinder/files/cinder.initd-2
b/sys-cluster/cinder/files/cinder.initd-2
index 8601a5869b0..31584dee9d2 100644
--- 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}
-}
-
