diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-12-29 18:09:16 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-01-04 13:27:27 +0100 |
| commit | d2e0ac3d1ea5ac3271958c5344bbb5594d4f5865 (patch) | |
| tree | 8549e5c7a3b8998d9610a08cd989fae98fffba09 /src/nspawn | |
| parent | 2e87a1fde9f46bee69c0980076cf6dc1f7cec7a4 (diff) | |
| download | systemd-d2e0ac3d1ea5ac3271958c5344bbb5594d4f5865.tar.gz | |
tree-wide: unify the process name we pass to wait_for_terminate_and_check() with the one we pass to safe_fork()
Diffstat (limited to 'src/nspawn')
| -rw-r--r-- | src/nspawn/nspawn.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 6a66c56ff1..383047acc7 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -3516,9 +3516,11 @@ static int run(int master, } /* Wait for the outer child. */ - r = wait_for_terminate_and_check("namespace helper", *pid, WAIT_LOG_ABNORMAL); - if (r != 0) - return r < 0 ? r : -EIO; + r = wait_for_terminate_and_check("(sd-namespace)", *pid, WAIT_LOG_ABNORMAL); + if (r < 0) + return r; + if (r != EXIT_SUCCESS) + return -EIO; /* And now retrieve the PID of the inner child. */ l = recv(pid_socket_pair[0], pid, sizeof *pid, 0); |