chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c3fec67
)
nspawn: fail if unable to close pipe
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Thu, 14 Feb 2013 16:02:02 +0000
(11:02 -0500)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Thu, 14 Feb 2013 20:26:33 +0000
(15:26 -0500)
src/nspawn/nspawn.c
patch
|
blob
|
history
diff --git
a/src/nspawn/nspawn.c
b/src/nspawn/nspawn.c
index 2fec9023a1a8a5212483138db3da5f02ed5ff109..b8962e9894480a0010326c2ba60800f9400bc1d7 100644
(file)
--- 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;