picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nspawn: report back to systemd only very late whether we are OK

Browse source 
That way, systemd can actually figure out if everything is OK with
nspawn.
This commit is contained in:
Lennart Poettering 2014-12-29 17:54:04 +01:00
parent f252d3fb2b
commit 814a3fdfdc
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/nspawn/nspawn.c
View file

@ -3132,10 +3132,6 @@ int main(int argc, char *argv[]) {
goto finish;
}
sd_notify(false,
"READY=1\n"
"STATUS=Container running.");
assert_se(sigemptyset(&mask) == 0);
sigset_add_many(&mask, SIGCHLD, SIGWINCH, SIGTERM, SIGINT, -1);
assert_se(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);
@ -3517,7 +3513,11 @@ int main(int argc, char *argv[]) {
/* Notify the child that the parent is ready with all
* its setup, and that the child can now hand over
* control to the code to run inside the container. */
(void)barrier_place(&barrier);
(void) barrier_place(&barrier);
sd_notify(false,
"READY=1\n"
"STATUS=Container running.");
r = sd_event_new(&event);
if (r < 0) {