From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AB103139694 for ; Sat, 29 Apr 2017 14:44:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D90B7E0BCB; Sat, 29 Apr 2017 14:44:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6379E0BCB for ; Sat, 29 Apr 2017 14:44:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE89E3412CB for ; Sat, 29 Apr 2017 14:44:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C4C773F3 for ; Sat, 29 Apr 2017 14:44:02 +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: <1493476867.5de3798afc55ce147e65926f863ec9c9cef60e79.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: src/rc/ X-VCS-Repository: proj/openrc X-VCS-Files: src/rc/supervise-daemon.c X-VCS-Directories: src/rc/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 5de3798afc55ce147e65926f863ec9c9cef60e79 X-VCS-Branch: master Date: Sat, 29 Apr 2017 14:44:02 +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: 19895173-8fa7-48d8-a441-45f662fbce01 X-Archives-Hash: 2ba401d6643a52079585bc5b6147e201 commit: 5de3798afc55ce147e65926f863ec9c9cef60e79 Author: William Hubbs gmail com> AuthorDate: Sat Apr 29 14:41:07 2017 +0000 Commit: William Hubbs gentoo org> CommitDate: Sat Apr 29 14:41:07 2017 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=5de3798a supervise-daemon: mark the service started when the supervisor is active src/rc/supervise-daemon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rc/supervise-daemon.c b/src/rc/supervise-daemon.c index 57d55194..5636eaab 100644 --- a/src/rc/supervise-daemon.c +++ b/src/rc/supervise-daemon.c @@ -694,6 +694,10 @@ int main(int argc, char **argv) fprintf(fp, "%d\n", getpid()); fclose(fp); + if (svcname) + rc_service_daemon_set(svcname, exec, + (const char * const *) argv, pidfile, true); + /* * Supervisor main loop */ @@ -718,10 +722,6 @@ int main(int argc, char **argv) } } - if (svcname) - rc_service_daemon_set(svcname, exec, - (const char * const *) argv, pidfile, true); - exit(EXIT_SUCCESS); } else if (child_pid == 0) child_process(exec, argv);