summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2013-10-05 17:19:06 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2013-10-08 12:06:09 -0500
commitb1de9d732458708248e1c69d31126e9afbd366a4 (patch)
treea2fe599db4c9f87b6294ef04d109e476200ea47d
parent5b4886d23e33dda68623def2d59745fd72ac4c53 (diff)
downloadopenrc-b1de9d732458708248e1c69d31126e9afbd366a4.tar.gz
openrc-b1de9d732458708248e1c69d31126e9afbd366a4.tar.bz2
openrc-b1de9d732458708248e1c69d31126e9afbd366a4.tar.xz
start-stop-daemon: fix do_stop calls
Several calls to do_stop were forcing the test parameter to be true, which was causing extra output to the terminal, such as: * Would send signal 0 to pid xxxxx This should only happen if the --test command line option was used. Conflicts: src/rc/start-stop-daemon.c
-rw-r--r--src/rc/start-stop-daemon.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c
index 0813eff..91696e3 100644
--- a/src/rc/start-stop-daemon.c
+++ b/src/rc/start-stop-daemon.c
@@ -459,7 +459,7 @@ run_stop_schedule(const char *exec, const char *const *argv,
{
if ((nrunning = do_stop(exec, argv,
pid, uid, 0, true, false,
- true)) == 0)
+ test)) == 0)
return 0;
@@ -1086,7 +1086,7 @@ start_stop_daemon(int argc, char **argv)
pid = 0;
if (do_stop(exec, (const char * const *)margv, pid, uid,
- 0, true, false, true) > 0)
+ 0, true, false, test) > 0)
eerrorx("%s: %s is already running", applet, exec);
if (test) {
@@ -1364,7 +1364,7 @@ start_stop_daemon(int argc, char **argv)
} else
pid = 0;
if (do_stop(exec, (const char *const *)margv,
- pid, uid, 0, true, false, true) > 0)
+ pid, uid, 0, true, false, test) > 0)
alive = true;
}