projects / lxc.git / blame
| Commit | Line | Data |
|---|---|---|
| 352dbb68 WB |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | From: Wolfgang Bumiller <w.bumiller@proxmox.com> | |
| 3 | Date: Thu, 17 Jan 2019 09:16:16 +0100 | |
| 4 | Subject: [PATCH] Revert "conf: remove extra MS_BIND with sysfs:mixed" | |
| 5 | ||
| 6 | This reverts commit 51a922baf724689ff3a0df938ca8975601c9c815. | |
| 7 | ||
| 8 | The above commit confuses the mountall unit of privileged | |
| 9 | Ubuntu 14.04 containers at startup so that they cannot | |
| 10 | finish booting. | |
| 11 | ||
| 12 | Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> | |
| 13 | --- | |
| 14 | src/lxc/conf.c | 1 + | |
| 15 | 1 file changed, 1 insertion(+) | |
| 16 | ||
| 17 | diff --git a/src/lxc/conf.c b/src/lxc/conf.c | |
| 40c4fcc7 | 18 | index 0d86d66e5..7263d0e1a 100644 |
| 352dbb68 WB |
19 | --- a/src/lxc/conf.c |
| 20 | +++ b/src/lxc/conf.c | |
| 21 | @@ -690,6 +690,7 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha | |
| 22 | { LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_RW, "sysfs", "%r/sys", "sysfs", 0, NULL }, | |
| 23 | { LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_RO, "sysfs", "%r/sys", "sysfs", MS_RDONLY, NULL }, | |
| 24 | { LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_MIXED, "sysfs", "%r/sys", "sysfs", MS_NODEV|MS_NOEXEC|MS_NOSUID, NULL }, | |
| 25 | + { LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_MIXED, "%r/sys", "%r/sys", NULL, MS_BIND, NULL }, | |
| 26 | { LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_MIXED, NULL, "%r/sys", NULL, MS_REMOUNT|MS_BIND|MS_RDONLY, NULL }, | |
| 27 | { LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_MIXED, "sysfs", "%r/sys/devices/virtual/net", "sysfs", 0, NULL }, | |
| 28 | { LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_MIXED, "%r/sys/devices/virtual/net/devices/virtual/net", "%r/sys/devices/virtual/net", NULL, MS_BIND, NULL }, | |
| 29 | -- | |
| 40c4fcc7 | 30 | 2.20.1 |
| 352dbb68 | 31 |