rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-05 11:06:13 +00:00
Code Issues Releases Wiki Activity

Merge pull request #593 from ibuildthecloud/shm-mqueue

Browse Source 
Bump docker-from-scratch to fix /dev/shm and /dev/mqueue
This commit is contained in:
Ivan Mikushin 2015-10-02 14:44:11 +05:00
commit 9ec819040d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -363,8 +363,8 @@
}, },
{ {
"ImportPath": "github.com/rancher/docker-from-scratch", "ImportPath": "github.com/rancher/docker-from-scratch",
"Comment": "v1.8.2-1-2-g5852c65", "Comment": "v1.8.2-1-4-ge435c54",
"Rev": "5852c65f66b6a5e850811dc9782d3b7400531fee" "Rev": "e435c547350adb6b30a64ec1c072f27177b70288"
}, },
{ {
"ImportPath": "github.com/rancher/netconf", "ImportPath": "github.com/rancher/netconf",

2
Godeps/_workspace/src/github.com/rancher/docker-from-scratch/scratch.go generated vendored
View File

@ -30,6 +30,8 @@ var (
mounts = [][]string{ mounts = [][]string{
{"devtmpfs", "/dev", "devtmpfs", ""}, {"devtmpfs", "/dev", "devtmpfs", ""},
{"none", "/dev/pts", "devpts", ""}, {"none", "/dev/pts", "devpts", ""},
{"shm", "/dev/shm", "tmpfs", "rw,nosuid,nodev,noexec,relatime,size=65536k"},
{"mqueue", "/dev/mqueue", "mqueue", "rw,nosuid,nodev,noexec,relatime"},
{"none", "/proc", "proc", ""}, {"none", "/proc", "proc", ""},
{"none", "/run", "tmpfs", ""}, {"none", "/run", "tmpfs", ""},
{"none", "/sys", "sysfs", ""}, {"none", "/sys", "sysfs", ""},