Merge pull request #314 from thaJeztah/17.09-backport-fix_chroot_mount_race

[17.09] Use rslave instead of rprivate in chrootarchive
This commit is contained in:
Andrew Hsu
2017-11-29 14:16:17 -08:00
committed by GitHub
@@ -26,8 +26,13 @@ func chroot(path string) (err error) {
return fmt.Errorf("Error creating mount namespace before pivot: %v", err)
}
// make everything in new ns private
if err := mount.MakeRPrivate("/"); err != nil {
// Make everything in new ns slave.
// Don't use `private` here as this could race where the mountns gets a
// reference to a mount and an unmount from the host does not propagate,
// which could potentially cause transient errors for other operations,
// even though this should be relatively small window here `slave` should
// not cause any problems.
if err := mount.MakeRSlave("/"); err != nil {
return err
}