forked from pool/libvirt
30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
|
commit 95c6cc344bec8405636d2a59fc0c34e0581001ab
|
||
|
|
Author: Daniel P. Berrange <berrange@redhat.com>
|
||
|
|
Date: Wed May 15 16:26:59 2013 +0100
|
||
|
|
|
||
|
|
Don't mount selinux fs in LXC if selinux is disabled
|
||
|
|
|
||
|
|
Before trying to mount the selinux filesystem in a container
|
||
|
|
use is_selinux_enabled() to check if the machine actually
|
||
|
|
has selinux support (eg not booted with selinux=0)
|
||
|
|
|
||
|
|
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
||
|
|
|
||
|
|
Index: libvirt-1.0.5/src/lxc/lxc_container.c
|
||
|
|
===================================================================
|
||
|
|
--- libvirt-1.0.5.orig/src/lxc/lxc_container.c
|
||
|
|
+++ libvirt-1.0.5/src/lxc/lxc_container.c
|
||
|
|
@@ -701,6 +701,12 @@ static int lxcContainerMountBasicFS(bool
|
||
|
|
(access(srcpath, R_OK) < 0))
|
||
|
|
continue;
|
||
|
|
|
||
|
|
+#if WITH_SELINUX
|
||
|
|
+ if (STREQ(mnts[i].src, SELINUX_MOUNT) &&
|
||
|
|
+ !is_selinux_enabled())
|
||
|
|
+ continue;
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
if (virFileMakePath(mnts[i].dst) < 0) {
|
||
|
|
virReportSystemError(errno,
|
||
|
|
_("Failed to mkdir %s"),
|