diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-01-31 01:02:07 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-01-31 01:02:07 +0000 |
| commit | cab28aa7de336b0a39ef43ce0eb035a2cab30d4d (patch) | |
| tree | 1f42544e65cd60dea87e631942506f1a5b206823 /runit | |
| parent | 6c62246a3598efd3d1e9264f8d9f44d8d93a6453 (diff) | |
| download | busybox-cab28aa7de336b0a39ef43ce0eb035a2cab30d4d.tar.gz | |
init: preparatory patch, no code changes
Diffstat (limited to 'runit')
| -rw-r--r-- | runit/runsv.c | 4 | ||||
| -rw-r--r-- | runit/svlogd.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/runit/runsv.c b/runit/runsv.c index 123720864..f83d58283 100644 --- a/runit/runsv.c +++ b/runit/runsv.c @@ -455,9 +455,9 @@ int runsv_main(int argc UNUSED_PARAM, char **argv) ndelay_on(selfpipe.wr); sig_block(SIGCHLD); - bb_signals_recursive(1 << SIGCHLD, s_child); + bb_signals_recursive_norestart(1 << SIGCHLD, s_child); sig_block(SIGTERM); - bb_signals_recursive(1 << SIGTERM, s_term); + bb_signals_recursive_norestart(1 << SIGTERM, s_term); xchdir(dir); /* bss: svd[0].pid = 0; */ diff --git a/runit/svlogd.c b/runit/svlogd.c index 9beb9f53f..9609fa37c 100644 --- a/runit/svlogd.c +++ b/runit/svlogd.c @@ -912,10 +912,10 @@ int svlogd_main(int argc, char **argv) sigaddset(&blocked_sigset, SIGALRM); sigaddset(&blocked_sigset, SIGHUP); sigprocmask(SIG_BLOCK, &blocked_sigset, NULL); - bb_signals_recursive(1 << SIGTERM, sig_term_handler); - bb_signals_recursive(1 << SIGCHLD, sig_child_handler); - bb_signals_recursive(1 << SIGALRM, sig_alarm_handler); - bb_signals_recursive(1 << SIGHUP, sig_hangup_handler); + bb_signals_recursive_norestart(1 << SIGTERM, sig_term_handler); + bb_signals_recursive_norestart(1 << SIGCHLD, sig_child_handler); + bb_signals_recursive_norestart(1 << SIGALRM, sig_alarm_handler); + bb_signals_recursive_norestart(1 << SIGHUP, sig_hangup_handler); logdirs_reopen(); |