1 |
commit: 6bb7ebec483a96e258c64ea3fea18358d7893fee |
2 |
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Nov 27 17:09:43 2017 +0000 |
4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 27 17:10:00 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=6bb7ebec |
7 |
|
8 |
fix FreeBSD build |
9 |
|
10 |
This is for #186. |
11 |
|
12 |
src/rc/supervise-daemon.c | 8 ++++++-- |
13 |
1 file changed, 6 insertions(+), 2 deletions(-) |
14 |
|
15 |
diff --git a/src/rc/supervise-daemon.c b/src/rc/supervise-daemon.c |
16 |
index f3f51ff0..06d0bdb3 100644 |
17 |
--- a/src/rc/supervise-daemon.c |
18 |
+++ b/src/rc/supervise-daemon.c |
19 |
@@ -159,7 +159,7 @@ static void cleanup(void) |
20 |
free(changeuser); |
21 |
} |
22 |
|
23 |
-static void re_exec(void) |
24 |
+static void re_exec_supervisor(void) |
25 |
{ |
26 |
syslog(LOG_WARNING, "Re-executing for %s", svcname); |
27 |
execlp("supervise-daemon", "supervise-daemon", svcname, "--reexec", |
28 |
@@ -180,7 +180,7 @@ static void handle_signal(int sig) |
29 |
/* Restore errno */ |
30 |
errno = serrno; |
31 |
if (! exiting) |
32 |
- re_exec(); |
33 |
+ re_exec_supervisor(); |
34 |
} |
35 |
|
36 |
static char * expand_home(const char *home, const char *path) |
37 |
@@ -435,7 +435,9 @@ static void supervisor(char *exec, char **argv) |
38 |
signal_setup_restart(SIGUSR1, handle_signal); |
39 |
signal_setup_restart(SIGUSR2, handle_signal); |
40 |
signal_setup_restart(SIGBUS, handle_signal); |
41 |
+#ifdef SIGPOLL |
42 |
signal_setup_restart(SIGPOLL, handle_signal); |
43 |
+#endif |
44 |
signal_setup_restart(SIGPROF, handle_signal); |
45 |
signal_setup_restart(SIGSYS, handle_signal); |
46 |
signal_setup_restart(SIGTRAP, handle_signal); |
47 |
@@ -446,7 +448,9 @@ static void supervisor(char *exec, char **argv) |
48 |
signal_setup_restart(SIGEMT, handle_signal); |
49 |
#endif |
50 |
signal_setup_restart(SIGIO, handle_signal); |
51 |
+#ifdef SIGPWR |
52 |
signal_setup_restart(SIGPWR, handle_signal); |
53 |
+#endif |
54 |
#ifdef SIGUNUSED |
55 |
signal_setup_restart(SIGUNUSED, handle_signal); |
56 |
#endif |