summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-02-14 11:02:02 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-02-14 15:26:33 -0500
commit5659774c575c3c7ac4aa0620a6528cd39e983af6 (patch)
tree0fc587659a3110461b67a55e6ea5dbb853090ea6
parentc3fec6715df4df7bfec9a0d0315e8f17b53eeb8e (diff)
nspawn: fail if unable to close pipe
-rw-r--r--src/nspawn/nspawn.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 2fec9023a1..b8962e9894 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1244,9 +1244,9 @@ int main(int argc, char *argv[]) {
envp[2] = strv_find_prefix(environ, "TERM=");
n_env = 3;
- close(pipefd[1]);
+ close_nointr_nofail(pipefd[1]);
fd_wait_for_event(pipefd[0], POLLHUP, -1);
- close(pipefd[0]);
+ close_nointr_nofail(pipefd[0]);
close_nointr_nofail(master);
master = -1;
@@ -1493,8 +1493,8 @@ int main(int argc, char *argv[]) {
}
log_info("Init process in the container running as PID %d", pid);
- close(pipefd[0]);
- close(pipefd[1]);
+ close_nointr_nofail(pipefd[0]);
+ close_nointr_nofail(pipefd[1]);
fdset_free(fds);
fds = NULL;