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 07AAB139084 for ; Mon, 27 Nov 2017 19:09:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41F58E0EAE; Mon, 27 Nov 2017 19:09:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1C0AFE0EBE for ; Mon, 27 Nov 2017 19:09:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 12E7E33D3C7 for ; Mon, 27 Nov 2017 19:09:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF7C6A9A0 for ; Mon, 27 Nov 2017 19:09:31 +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: <1511808584.bed1a4519295a86f7cc62a79604d73a8ae726103.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:0.34.x 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: bed1a4519295a86f7cc62a79604d73a8ae726103 X-VCS-Branch: 0.34.x Date: Mon, 27 Nov 2017 19:09:31 +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: e028b634-f886-4cbf-bc03-f639ab141eb4 X-Archives-Hash: e08c7e7954fd6162b81346add8bea31b commit: bed1a4519295a86f7cc62a79604d73a8ae726103 Author: William Hubbs gmail com> AuthorDate: Mon Nov 27 17:09:43 2017 +0000 Commit: William Hubbs gentoo org> CommitDate: Mon Nov 27 18:49:44 2017 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=bed1a451 fix FreeBSD build This is for #186. src/rc/supervise-daemon.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/rc/supervise-daemon.c b/src/rc/supervise-daemon.c index f3f51ff0..06d0bdb3 100644 --- a/src/rc/supervise-daemon.c +++ b/src/rc/supervise-daemon.c @@ -159,7 +159,7 @@ static void cleanup(void) free(changeuser); } -static void re_exec(void) +static void re_exec_supervisor(void) { syslog(LOG_WARNING, "Re-executing for %s", svcname); execlp("supervise-daemon", "supervise-daemon", svcname, "--reexec", @@ -180,7 +180,7 @@ static void handle_signal(int sig) /* Restore errno */ errno = serrno; if (! exiting) - re_exec(); + re_exec_supervisor(); } static char * expand_home(const char *home, const char *path) @@ -435,7 +435,9 @@ static void supervisor(char *exec, char **argv) signal_setup_restart(SIGUSR1, handle_signal); signal_setup_restart(SIGUSR2, handle_signal); signal_setup_restart(SIGBUS, handle_signal); +#ifdef SIGPOLL signal_setup_restart(SIGPOLL, handle_signal); +#endif signal_setup_restart(SIGPROF, handle_signal); signal_setup_restart(SIGSYS, handle_signal); signal_setup_restart(SIGTRAP, handle_signal); @@ -446,7 +448,9 @@ static void supervisor(char *exec, char **argv) signal_setup_restart(SIGEMT, handle_signal); #endif signal_setup_restart(SIGIO, handle_signal); +#ifdef SIGPWR signal_setup_restart(SIGPWR, handle_signal); +#endif #ifdef SIGUNUSED signal_setup_restart(SIGUNUSED, handle_signal); #endif