1 |
commit: 9e99199229c29dc1ffaa1539cd6e80b12e5ecb68 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 30 06:30:03 2016 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 30 06:30:49 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e991992 |
7 |
|
8 |
sys-cluster/nova: fixing init for realz |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
sys-cluster/nova/files/nova.initd | 13 +++++++++---- |
13 |
1 file changed, 9 insertions(+), 4 deletions(-) |
14 |
|
15 |
diff --git a/sys-cluster/nova/files/nova.initd b/sys-cluster/nova/files/nova.initd |
16 |
index a75a33c..2edbed9 100644 |
17 |
--- a/sys-cluster/nova/files/nova.initd |
18 |
+++ b/sys-cluster/nova/files/nova.initd |
19 |
@@ -4,14 +4,13 @@ |
20 |
|
21 |
description="Starts ${SVCNAME} service for OpenStack" |
22 |
|
23 |
-command=/usr/bin/${SVCNAME} |
24 |
-command_background=yes |
25 |
+command="/usr/bin/${SVCNAME} -- --config-file /etc/nova/nova.conf" |
26 |
pidfile=/var/run/nova/${SVCNAME}.pid |
27 |
required_files=/etc/nova/nova.conf |
28 |
-start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova} -- --config-file /etc/nova/nova.conf" |
29 |
+start_stop_daemon_args="--quiet --user ${NOVA_USER:-nova}" |
30 |
if [ "$SVCNAME" == nova-compute ]; then |
31 |
required_files="${required_files} /etc/nova/nova-compute.conf" |
32 |
- start_stop_daemon_args="${start_stop_daemon_args} --config-file /etc/nova/nova-compute.conf" |
33 |
+ command="${command} --config-file /etc/nova/nova-compute.conf" |
34 |
fi |
35 |
|
36 |
|
37 |
@@ -23,3 +22,9 @@ start_pre() { |
38 |
checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/run/nova} |
39 |
checkpath --directory --owner ${NOVA_USER:-nova}:${NOVA_GROUP:-nova} --mode 0775 ${NOVA_RUN:-/var/lock/nova} |
40 |
} |
41 |
+ |
42 |
+start() { |
43 |
+ ebegin "Starting ${SVCNAME}" |
44 |
+ start-stop-daemon -S -b -p ${pidfile} -q -u ${NOVA_USER:-nova} -x ${command} |
45 |
+ eend $? |
46 |
+} |