From: Yang hongyang Date: Sat, 25 Jun 2016 03:53:49 +0000 (+0800) Subject: lxc_container: remove extra bool from lxcBasicMounts initialization X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fv1.2.9-maint;p=thirdparty%2Flibvirt.git lxc_container: remove extra bool from lxcBasicMounts initialization Seems a backport miss. An extra member is passed to struct virLXCBasicMountInfo. Signed-off-by: Yang hongyang Commit bda5f2b (a backport of commit 2471041) listed one more value than the virLXCBasicMountInfo has here, because v1.2.9-maint does not have the skipNoNetns bool (introduced by commit ba9b725 released in 1.2.11). Signed-off-by: Ján Tomko --- diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 28dabecbbd..1c65fa9f99 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -760,7 +760,7 @@ typedef struct { static const virLXCBasicMountInfo lxcBasicMounts[] = { { "proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, - { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false, false, false }, + { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false, false }, { "sysfs", "/sys", "sysfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false, false }, { "securityfs", "/sys/kernel/security", "securityfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true, true }, #if WITH_SELINUX