emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

runit cleanup part 1

Browse Source
This commit is contained in:
Denis Vlasenko
2007-01-27 22:21:52 +00:00
parent e06bed30cf
commit 8c78395120
6 changed files with 272 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
runit/runsv.c
View File

@@ -307,10 +307,10 @@ static void startservice(struct svdir *s)
close(logpipe[0]);
}
}
sig_uncatch(sig_child);
sig_unblock(sig_child);
sig_uncatch(sig_term);
sig_unblock(sig_term);
sig_uncatch(SIGCHLD);
sig_unblock(SIGCHLD);
sig_uncatch(SIGTERM);
sig_unblock(SIGTERM);
execve(*run, run, environ);
if (s->islog)
fatal2_cannot("start log/", *run);
@@ -406,10 +406,10 @@ int runsv_main(int argc, char **argv)
ndelay_on(selfpipe[0]);
ndelay_on(selfpipe[1]);
sig_block(sig_child);
sig_catch(sig_child, s_child);
sig_block(sig_term);
sig_catch(sig_term, s_term);
sig_block(SIGCHLD);
sig_catch(SIGCHLD, s_child);
sig_block(SIGTERM);
sig_catch(SIGTERM, s_term);
xchdir(dir);
svd[0].pid = 0;
@@ -533,11 +533,11 @@ int runsv_main(int argc, char **argv)
taia_uint(&deadline, 3600);
taia_add(&deadline, &now, &deadline);
sig_unblock(sig_term);
sig_unblock(sig_child);
sig_unblock(SIGTERM);
sig_unblock(SIGCHLD);
iopause(x, 2+haslog, &deadline, &now);
sig_block(sig_term);
sig_block(sig_child);
sig_block(SIGTERM);
sig_block(SIGCHLD);
while (read(selfpipe[0], &ch, 1) == 1)
;