mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-24 14:10:17 +02:00
31 lines
911 B
Diff
31 lines
911 B
Diff
--- a/src/lxc/lxc_container.c
|
|
+++ b/src/lxc/lxc_container.c
|
|
@@ -750,7 +750,7 @@ err:
|
|
}
|
|
|
|
|
|
-static int lxcContainerMountBasicFS(void)
|
|
+static int lxcContainerMountBasicFS(bool userns_enabled)
|
|
{
|
|
const struct {
|
|
const char *src;
|
|
@@ -801,6 +801,9 @@ static int lxcContainerMountBasicFS(void)
|
|
continue;
|
|
#endif
|
|
|
|
+ if (STREQ(mnts[i].src, "securityfs") && userns_enabled)
|
|
+ continue;
|
|
+
|
|
if (virFileMakePath(mnts[i].dst) < 0) {
|
|
virReportSystemError(errno,
|
|
_("Failed to mkdir %s"),
|
|
@@ -1530,7 +1533,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef,
|
|
goto cleanup;
|
|
|
|
/* Mounts the core /proc, /sys, etc filesystems */
|
|
- if (lxcContainerMountBasicFS() < 0)
|
|
+ if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap) < 0)
|
|
goto cleanup;
|
|
|
|
/* Mounts /proc/meminfo etc sysinfo */
|