summary refs log tree commit diff
path: root/pkgs/development/libraries/libvirt/securtyfs_userns.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/libraries/libvirt/securtyfs_userns.patch')
-rw-r--r--pkgs/development/libraries/libvirt/securtyfs_userns.patch30
1 files changed, 0 insertions, 30 deletions
diff --git a/pkgs/development/libraries/libvirt/securtyfs_userns.patch b/pkgs/development/libraries/libvirt/securtyfs_userns.patch
deleted file mode 100644
index 2723334f94a..00000000000
--- a/pkgs/development/libraries/libvirt/securtyfs_userns.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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 */