p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #24061 from dmcgowan/close-reader-after-mount-exec

Browse Source 
overlay2: close read end of pipe on mount exec
Upstream-commit: 57977fb1273337db0e5da46faf4068c4073aa0bb
Component: engine
This commit is contained in:
Alexander Morozov
2016-06-28 14:58:56 -07:00
committed by GitHub
parent be8ea5149d 860c6cce0c
commit 217e2bc779
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/engine/daemon/graphdriver/overlay2/mount.go
View File

@ -32,12 +32,6 @@ type mountOptions struct {
}
func mountFrom(dir, device, target, mType, label string) error {
r, w, err := os.Pipe()
if err != nil {
return fmt.Errorf("mountfrom pipe failure: %v", err)
}
options := &mountOptions{
Device: device,
Target: target,
@ -47,7 +41,10 @@ func mountFrom(dir, device, target, mType, label string) error {
}
cmd := reexec.Command("docker-mountfrom", dir)
cmd.Stdin = r
w, err := cmd.StdinPipe()
if err != nil {
return fmt.Errorf("mountfrom error on pipe creation: %v", err)
}
output := bytes.NewBuffer(nil)
cmd.Stdout = output