mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 21:34:54 +03:00
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
This commit is contained in:
parent
07cbb610ba
commit
1532bd498a
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user