提交 1532bd49 编写于 作者: D Daniel P. Berrange

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
上级 07cbb610
...@@ -1191,6 +1191,8 @@ static int lxcContainerGetSubtree(const char *prefix, ...@@ -1191,6 +1191,8 @@ static int lxcContainerGetSubtree(const char *prefix,
char **mounts = NULL; char **mounts = NULL;
size_t nmounts = 0; size_t nmounts = 0;
VIR_DEBUG("prefix=%s", prefix);
*mountsret = NULL; *mountsret = NULL;
*nmountsret = 0; *nmountsret = 0;
...@@ -1528,7 +1530,8 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, ...@@ -1528,7 +1530,8 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef,
/* Some versions of Linux kernel don't let you overmount /* Some versions of Linux kernel don't let you overmount
* the selinux filesystem, so make sure we kill it first * 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; goto cleanup;
#endif #endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册