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

Merge pull request #5565 from creack/fix_devpts

Browse Source 
Month devpts before mounting subdirs
Upstream-commit: ac7b2b888da4c9775c47c0f3139cdc2f643098a2
Component: engine
This commit is contained in:
Michael Crosby
2014-05-02 14:14:46 -07:00
parent 8a4635dfd2 ac76593583
commit bc81f65847
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/pkg/libcontainer/mount/init.go
View File

@ -128,7 +128,7 @@ func newSystemMounts(rootfs, mountLabel string, mounts libcontainer.Mounts) []mo
}
if len(mounts.OfType("devtmpfs")) == 1 {
systemMounts = append(systemMounts, mount{source: "tmpfs", path: filepath.Join(rootfs, "dev"), device: "tmpfs", flags: syscall.MS_NOSUID | syscall.MS_STRICTATIME, data: label.FormatMountLabel("mode=755", mountLabel)})
systemMounts = append([]mount{{source: "tmpfs", path: filepath.Join(rootfs, "dev"), device: "tmpfs", flags: syscall.MS_NOSUID | syscall.MS_STRICTATIME, data: label.FormatMountLabel("mode=755", mountLabel)}}, systemMounts...)
}
return systemMounts
}