app-emulation/ganeti/files/ganeti-2.11-start-stop-daemon-args.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39

diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
index 4d1d7c5..3deeab7 100644
--- a/daemons/daemon-util.in
+++ b/daemons/daemon-util.in
@@ -246,10 +246,11 @@ start() {
   @PKGLIBDIR@/ensure-dirs
 
   if type -p start-stop-daemon >/dev/null; then
-    start-stop-daemon --start --quiet --oknodo \
+    start-stop-daemon --start --quiet \
       --pidfile $pidfile \
-      --startas $daemonexec \
-      --chuid $usergroup \
+      --exec $daemonexec \
+      --user $usergroup \
+      --wait 300 \
       -- $args "$@"
   else
     # TODO: Find a way to start daemon with a group, until then the group must
@@ -273,7 +274,7 @@ stop() {
   local pidfile=$(_daemon_pidfile $name)
 
   if type -p start-stop-daemon >/dev/null; then
-    start-stop-daemon --stop --quiet --oknodo --retry 30 \
+    start-stop-daemon --stop --quiet --retry 30 \
       --pidfile $pidfile
   else
     _ignore_error killproc -p $pidfile $name
@@ -348,8 +348,8 @@ rotate_logs() {
   local daemonexec=$(_daemon_executable $name)
 
   if type -p start-stop-daemon >/dev/null; then
-    start-stop-daemon --stop --signal HUP --quiet \
-      --oknodo --pidfile $pidfile
+    start-stop-daemon --signal HUP --quiet \
+      --pidfile $pidfile
   else
     _ignore_error killproc \
       -p $pidfile \