From: Christian Brauner Date: Tue, 11 Sep 2018 10:14:04 +0000 (+0200) Subject: conf: remove extra MS_BIND with sysfs:mixed X-Git-Tag: lxc-3.1.0~103^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51a922baf724689ff3a0df938ca8975601c9c815;p=thirdparty%2Flxc.git conf: remove extra MS_BIND with sysfs:mixed The extra bind-mount is not required. To succesfully remount read-only we just need MS_REMOUNT|MS_RDONLY. Closes #2602. Signed-off-by: Christian Brauner Cc: Serge Hallyn --- diff --git a/src/lxc/conf.c b/src/lxc/conf.c index 52fc49c91..35f6733cd 100644 --- a/src/lxc/conf.c +++ b/src/lxc/conf.c @@ -694,7 +694,6 @@ 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 },