diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-25 10:09:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-25 10:09:43 -0500 |
| commit | 92635c726ac063770f20ce9cc3da48f33a5ad73b (patch) | |
| tree | e6be6f4dc40de3d627b07824309b2b857ceb30c3 /libpod/oci_attach_linux.go | |
| parent | 534c4881b51b1bffaac1afcfbcfdc0dde09ccdb4 (diff) | |
| parent | e252b3b4f294745ca8ac6d1c1850de2e7f1365c7 (diff) | |
| download | podman-92635c726ac063770f20ce9cc3da48f33a5ad73b.tar.gz podman-92635c726ac063770f20ce9cc3da48f33a5ad73b.tar.bz2 podman-92635c726ac063770f20ce9cc3da48f33a5ad73b.zip | |
Merge pull request #12857 from giuseppe/fix-rm-dir-not-empty
exec: retry rm -rf on ENOTEMPTY and EBUSY
Diffstat (limited to 'libpod/oci_attach_linux.go')
| -rw-r--r-- | libpod/oci_attach_linux.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libpod/oci_attach_linux.go b/libpod/oci_attach_linux.go index 1c15d567c..1ee664e81 100644 --- a/libpod/oci_attach_linux.go +++ b/libpod/oci_attach_linux.go @@ -273,9 +273,11 @@ func readStdio(conn *net.UnixConn, streams *define.AttachStreams, receiveStdoutE var err error select { case err = <-receiveStdoutError: + conn.CloseWrite() return err case err = <-stdinDone: if err == define.ErrDetach { + conn.CloseWrite() return err } if err == nil { |