gentoo resync : 22.12.2021

1 files changed, 32 insertions, 0 deletions

diff --git a/app-emulation/libvirt/files/libvirt-7.9.0-fix_cgroupv2.patch b/app-emulation/libvirt/files/libvirt-7.9.0-fix_cgroupv2.patch
new file mode 100644
index 000000000000..1309996f3ecf
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-7.9.0-fix_cgroupv2.patch
@@ -0,0 +1,32 @@
+From c80a05cd7d5f17ee16a2bc2546981863451fcab7 Mon Sep 17 00:00:00 2001
+From: "System user; portage" <portage@kestrel.43-1.org>
+Date: Wed, 8 Dec 2021 15:07:06 -0600
+Subject: [PATCH] Revert "lxc: controller: Fix container launch on cgroup v1"
+
+This reverts commit 1b9ce05ce241a581d4e80228c92ceb0266f21f94.
+---
+ src/lxc/lxc_controller.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
+index 444f728af4..8953e0c904 100644
+--- a/src/lxc/lxc_controller.c
++++ b/src/lxc/lxc_controller.c
+@@ -865,12 +865,12 @@ static int virLXCControllerSetupCgroupLimits(virLXCController *ctrl)
+     nodeset = virDomainNumatuneGetNodeset(ctrl->def->numa, auto_nodeset, -1);
+ 
+     if (!(ctrl->cgroup = virLXCCgroupCreate(ctrl->def,
+-                                            getpid(),
++                                            ctrl->initpid,
+                                             ctrl->nnicindexes,
+                                             ctrl->nicindexes)))
+         goto cleanup;
+ 
+-    if (virCgroupAddMachineProcess(ctrl->cgroup, ctrl->initpid) < 0)
++    if (virCgroupAddMachineProcess(ctrl->cgroup, getpid()) < 0)
+         goto cleanup;
+ 
+     /* Add all qemu-nbd tasks to the cgroup */
+-- 
+2.32.0
+