diff options
| author | Yang hongyang <hongyang.yang@easystack.cn> | 2016-06-25 11:53:49 +0800 |
|---|---|---|
| committer | Ján Tomko <jtomko@redhat.com> | 2016-07-01 10:16:30 +0200 |
| commit | 4266e17d62c95f6dd72e84a628d239a53750fee1 (patch) | |
| tree | a7f2aac309dadde5c95d35175afef0c0457f1288 | |
| parent | f32441c69bf450d6ac593c3acd621c37e120cdaf (diff) | |
| download | libvirt-v1.2.9-maint.tar.gz | |
lxc_container: remove extra bool from lxcBasicMounts initializationv1.2.9-maint
Seems a backport miss. An extra member is passed to struct
virLXCBasicMountInfo.
Signed-off-by: Yang hongyang <hongyang.yang@easystack.cn>
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 <jtomko@redhat.com>
| -rw-r--r-- | src/lxc/lxc_container.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |