From 814a3fdfdc8cd94797eff5f3e1d9a3cc032d880a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 29 Dec 2014 17:54:04 +0100 Subject: [PATCH] nspawn: report back to systemd only very late whether we are OK That way, systemd can actually figure out if everything is OK with nspawn. --- src/nspawn/nspawn.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index f255e5788..6aaceac30 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -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) { -- 2.30.2