This reverts commit 905795ece624675abe2ec2622b0bbafdb9d7f44c.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
| ... | ... |
@@ -92,7 +92,6 @@ lxc.pivotdir = lxc_putold |
| 92 | 92 |
# We cannot mount them directly read-only, because that would prevent loading AppArmor profiles. |
| 93 | 93 |
lxc.mount.entry = proc {{escapeFstabSpaces $ROOTFS}}/proc proc nosuid,nodev,noexec 0 0
|
| 94 | 94 |
lxc.mount.entry = sysfs {{escapeFstabSpaces $ROOTFS}}/sys sysfs nosuid,nodev,noexec 0 0
|
| 95 |
-lxc.mount.entry = tmpfs {{escapeFstabSpaces $ROOTFS}}/run tmpfs nosuid,nodev,noexec 0 0
|
|
| 96 | 95 |
|
| 97 | 96 |
{{if .Tty}}
|
| 98 | 97 |
lxc.mount.entry = {{.Console}} {{escapeFstabSpaces $ROOTFS}}/dev/console none bind,rw 0 0
|
| ... | ... |
@@ -197,7 +197,6 @@ func newSystemMounts(rootfs, mountLabel string, mounts libcontainer.Mounts) []mo |
| 197 | 197 |
{source: "sysfs", path: filepath.Join(rootfs, "sys"), device: "sysfs", flags: defaultMountFlags},
|
| 198 | 198 |
{source: "shm", path: filepath.Join(rootfs, "dev", "shm"), device: "tmpfs", flags: defaultMountFlags, data: label.FormatMountLabel("mode=1777,size=65536k", mountLabel)},
|
| 199 | 199 |
{source: "devpts", path: filepath.Join(rootfs, "dev", "pts"), device: "devpts", flags: syscall.MS_NOSUID | syscall.MS_NOEXEC, data: label.FormatMountLabel("newinstance,ptmxmode=0666,mode=620,gid=5", mountLabel)},
|
| 200 |
- {source: "tmpfs", path: filepath.Join(rootfs, "run"), device: "tmpfs", flags: defaultMountFlags},
|
|
| 201 | 200 |
} |
| 202 | 201 |
|
| 203 | 202 |
if len(mounts.OfType("devtmpfs")) == 1 {
|