From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8807C1381F3 for ; Tue, 8 Oct 2013 17:10:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDFE4E08EA; Tue, 8 Oct 2013 17:10:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4141CE08E1 for ; Tue, 8 Oct 2013 17:10:23 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E72133EEC8 for ; Tue, 8 Oct 2013 17:10:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E90A3E5460 for ; Tue, 8 Oct 2013 17:10:20 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1381251969.b1de9d732458708248e1c69d31126e9afbd366a4.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:openrc-0.12.x commit in: src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/rc/start-stop-daemon.c X-VCS-Directories: src/rc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: b1de9d732458708248e1c69d31126e9afbd366a4 X-VCS-Branch: openrc-0.12.x Date: Tue, 8 Oct 2013 17:10:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 745a7884-abd8-4ed4-a47d-9f6c8e2abe7c X-Archives-Hash: faaf4daa24531c130a4de862f85ad606 commit: b1de9d732458708248e1c69d31126e9afbd366a4 Author: William Hubbs gmail com> AuthorDate: Sat Oct 5 22:19:06 2013 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Oct 8 17:06:09 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=b1de9d73 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 --- src/rc/start-stop-daemon.c | 6 +++--- 1 file 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; }