From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 14 Feb 2013 16:02:02 +0000 (-0500)
Subject: nspawn: fail if unable to close pipe
X-Git-Tag: v198~234
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5659774c575c3c7ac4aa0620a6528cd39e983af6;p=elogind.git

nspawn: fail if unable to close pipe
---

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 2fec9023a..b8962e989 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;