From: Wolfgang Bumiller Date: Thu, 17 Jan 2019 08:16:16 +0000 (+0100) Subject: Revert "conf: remove extra MS_BIND with sysfs:mixed" X-Git-Tag: lxc-3.2.0~169^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1c203f480df0fa13ac008a7d9db9e64456f3e9c;p=thirdparty%2Flxc.git Revert "conf: remove extra MS_BIND with sysfs:mixed" This reverts commit 51a922baf724689ff3a0df938ca8975601c9c815. The above commit confuses the mountall unit of privileged Ubuntu 14.04 containers at startup so that they cannot finish booting. Signed-off-by: Wolfgang Bumiller --- diff --git a/src/lxc/conf.c b/src/lxc/conf.c index 0d86d66e5..7263d0e1a 100644 --- a/src/lxc/conf.c +++ b/src/lxc/conf.c @@ -690,6 +690,7 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha { LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_RW, "sysfs", "%r/sys", "sysfs", 0, NULL }, { LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_RO, "sysfs", "%r/sys", "sysfs", MS_RDONLY, NULL }, { LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_MIXED, "sysfs", "%r/sys", "sysfs", MS_NODEV|MS_NOEXEC|MS_NOSUID, NULL }, + { LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_MIXED, "%r/sys", "%r/sys", NULL, MS_BIND, NULL }, { LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_MIXED, NULL, "%r/sys", NULL, MS_REMOUNT|MS_BIND|MS_RDONLY, NULL }, { LXC_AUTO_SYS_MASK, LXC_AUTO_SYS_MIXED, "sysfs", "%r/sys/devices/virtual/net", "sysfs", 0, NULL }, { 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 },