beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #28047 from cpuguy83/27773_chrootarchive_rbind

Browse source 
Fix issue with cp to container volume dir
This commit is contained in:
Michael Crosby 2016-11-09 10:52:14 -08:00 committed by GitHub
commit da0ccf8e61
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/chrootarchive/chroot_linux.go
View file

@ -30,9 +30,11 @@ func chroot(path string) (err error) {
if err := mount.MakeRPrivate("/"); err != nil { if err := mount.MakeRPrivate("/"); err != nil {
return err return err
} }
// ensure path is a mountpoint
if err := mount.MakePrivate(path); err != nil { if mounted, _ := mount.Mounted(path); !mounted {
return err if err := mount.Mount(path, path, "bind", "rbind,rw"); err != nil {
return realChroot(path)
}
} }
// setup oldRoot for pivot_root // setup oldRoot for pivot_root