From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 25 Sep 2012 15:24:10 +0000 (+0100)
Subject: Fix start of containers with custom root filesystem
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1532bd498a879494bb1e4757a54fce796eab368c;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

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
---

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index a749d2442..4bb2affdb 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