From 6b2a4e251469db13ff397222d024d1b93ae33bcf Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 25 Sep 2012 16:24:10 +0100 Subject: [PATCH] Fix start of containers with custom root filesystem A prefix change to unmount the SELinux filesystem broke starting of LXC containers with a custom root filesystem (cherry picked from commit 1532bd498a879494bb1e4757a54fce796eab368c) --- src/lxc/lxc_container.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a749d24423..4bb2affdb1 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1191,6 +1191,8 @@ static int lxcContainerGetSubtree(const char *prefix, char **mounts = NULL; size_t nmounts = 0; + VIR_DEBUG("prefix=%s", prefix); + *mountsret = NULL; *nmountsret = 0; @@ -1528,7 +1530,8 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, /* Some versions of Linux kernel don't let you overmount * the selinux filesystem, so make sure we kill it first */ - if (lxcContainerUnmountSubtree(SELINUX_MOUNT, false) < 0) + if (STREQ(root->src, "/") && + lxcContainerUnmountSubtree(SELINUX_MOUNT, false) < 0) goto cleanup; #endif