projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b6e953f
)
nspawn: try to wait for the container PID 1 to exit, before we exit
author
Lennart Poettering
<lennart@poettering.net>
Fri, 18 Nov 2016 22:47:09 +0000
(23:47 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 22 Nov 2016 12:35:09 +0000
(13:35 +0100)
Let's make the shutdown logic synchronous, so that there's a better chance to
detach the loopback device after use.
src/nspawn/nspawn.c
patch
|
blob
|
history
diff --git
a/src/nspawn/nspawn.c
b/src/nspawn/nspawn.c
index
0ca0b2f
..
8e4b94e
100644
(file)
--- a/
src/nspawn/nspawn.c
+++ b/
src/nspawn/nspawn.c
@@
-4349,8
+4349,13
@@
finish:
kill(pid, SIGKILL);
/* Try to flush whatever is still queued in the pty */
- if (master >= 0)
+ if (master >= 0)
{
(void) copy_bytes(master, STDOUT_FILENO, (uint64_t) -1, false);
+ master = safe_close(master);
+ }
+
+ if (pid > 0)
+ (void) wait_for_terminate(pid, NULL);
loop_remove(loop_nr, &image_fd);