diff options
Diffstat (limited to 'runit/runsv.c')
-rw-r--r-- | runit/runsv.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/runit/runsv.c b/runit/runsv.c index aace041a8..24a51f2b1 100644 --- a/runit/runsv.c +++ b/runit/runsv.c | |||
@@ -307,10 +307,10 @@ static void startservice(struct svdir *s) | |||
307 | close(logpipe[0]); | 307 | close(logpipe[0]); |
308 | } | 308 | } |
309 | } | 309 | } |
310 | sig_uncatch(sig_child); | 310 | sig_uncatch(SIGCHLD); |
311 | sig_unblock(sig_child); | 311 | sig_unblock(SIGCHLD); |
312 | sig_uncatch(sig_term); | 312 | sig_uncatch(SIGTERM); |
313 | sig_unblock(sig_term); | 313 | sig_unblock(SIGTERM); |
314 | execve(*run, run, environ); | 314 | execve(*run, run, environ); |
315 | if (s->islog) | 315 | if (s->islog) |
316 | fatal2_cannot("start log/", *run); | 316 | fatal2_cannot("start log/", *run); |
@@ -406,10 +406,10 @@ int runsv_main(int argc, char **argv) | |||
406 | ndelay_on(selfpipe[0]); | 406 | ndelay_on(selfpipe[0]); |
407 | ndelay_on(selfpipe[1]); | 407 | ndelay_on(selfpipe[1]); |
408 | 408 | ||
409 | sig_block(sig_child); | 409 | sig_block(SIGCHLD); |
410 | sig_catch(sig_child, s_child); | 410 | sig_catch(SIGCHLD, s_child); |
411 | sig_block(sig_term); | 411 | sig_block(SIGTERM); |
412 | sig_catch(sig_term, s_term); | 412 | sig_catch(SIGTERM, s_term); |
413 | 413 | ||
414 | xchdir(dir); | 414 | xchdir(dir); |
415 | svd[0].pid = 0; | 415 | svd[0].pid = 0; |
@@ -533,11 +533,11 @@ int runsv_main(int argc, char **argv) | |||
533 | taia_uint(&deadline, 3600); | 533 | taia_uint(&deadline, 3600); |
534 | taia_add(&deadline, &now, &deadline); | 534 | taia_add(&deadline, &now, &deadline); |
535 | 535 | ||
536 | sig_unblock(sig_term); | 536 | sig_unblock(SIGTERM); |
537 | sig_unblock(sig_child); | 537 | sig_unblock(SIGCHLD); |
538 | iopause(x, 2+haslog, &deadline, &now); | 538 | iopause(x, 2+haslog, &deadline, &now); |
539 | sig_block(sig_term); | 539 | sig_block(SIGTERM); |
540 | sig_block(sig_child); | 540 | sig_block(SIGCHLD); |
541 | 541 | ||
542 | while (read(selfpipe[0], &ch, 1) == 1) | 542 | while (read(selfpipe[0], &ch, 1) == 1) |
543 | ; | 543 | ; |