summaryrefslogtreecommitdiffstats
path: root/src/nspawn
diff options
context:
space:
mode:
authorKrzesimir Nowak <krzesimir@endocode.com>2015-09-22 14:16:17 +0200
committerDavid Herrmann <dh.herrmann@gmail.com>2015-09-22 14:17:03 +0200
commitc0ffce2bd179699ad77808ffe480e499f1f775ef (patch)
treec775fa62445c5a19f0c7b3fad71435320d21c6d5 /src/nspawn
parentnspawn: close unneeded sockets in outer child (diff)
downloadsystemd-c0ffce2bd179699ad77808ffe480e499f1f775ef.tar.xz
systemd-c0ffce2bd179699ad77808ffe480e499f1f775ef.zip
nspawn, machined: fix comments and error messages
A bunch of "Client -> Child" fixes and one barrier-enumerator fix. (David: rebased on master)
Diffstat (limited to 'src/nspawn')
-rw-r--r--src/nspawn/nspawn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 8da22e9fd0..7451c2bf64 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3474,8 +3474,8 @@ int main(int argc, char *argv[]) {
}
/* Let the child know that we are ready and wait that the child is completely ready now. */
- if (!barrier_place_and_sync(&barrier)) { /* #5 */
- log_error("Client died too early.");
+ if (!barrier_place_and_sync(&barrier)) { /* #4 */
+ log_error("Child died too early.");
r = -ESRCH;
goto finish;
}