diff options
Diffstat (limited to 'runit/runsv.c')
| -rw-r--r-- | runit/runsv.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/runit/runsv.c b/runit/runsv.c index e1d99e2df..02271d68b 100644 --- a/runit/runsv.c +++ b/runit/runsv.c | |||
| @@ -345,8 +345,10 @@ static void startservice(struct svdir *s) | |||
| 345 | xdup2(logpipe.wr, 1); | 345 | xdup2(logpipe.wr, 1); |
| 346 | } | 346 | } |
| 347 | } | 347 | } |
| 348 | signal(SIGCHLD, SIG_DFL); | 348 | bb_signals(0 |
| 349 | signal(SIGTERM, SIG_DFL); | 349 | + (1 << SIGCHLD) |
| 350 | + (1 << SIGTERM) | ||
| 351 | , SIG_DFL); | ||
| 350 | sig_unblock(SIGCHLD); | 352 | sig_unblock(SIGCHLD); |
| 351 | sig_unblock(SIGTERM); | 353 | sig_unblock(SIGTERM); |
| 352 | execvp(*run, run); | 354 | execvp(*run, run); |
| @@ -460,9 +462,9 @@ int runsv_main(int argc, char **argv) | |||
| 460 | ndelay_on(selfpipe.wr); | 462 | ndelay_on(selfpipe.wr); |
| 461 | 463 | ||
| 462 | sig_block(SIGCHLD); | 464 | sig_block(SIGCHLD); |
| 463 | sig_catch(SIGCHLD, s_child); | 465 | bb_signals_recursive(1 << SIGCHLD, s_child); |
| 464 | sig_block(SIGTERM); | 466 | sig_block(SIGTERM); |
| 465 | sig_catch(SIGTERM, s_term); | 467 | bb_signals_recursive(1 << SIGTERM, s_term); |
| 466 | 468 | ||
| 467 | xchdir(dir); | 469 | xchdir(dir); |
| 468 | /* bss: svd[0].pid = 0; */ | 470 | /* bss: svd[0].pid = 0; */ |