launchpad-reviewers team mailing list archive

[Colin Watson <mp+455733@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad-buildd:cgroup2 into launchpad-buildd:master.

Commit message:
Add lxc.cgroup2.* configuration

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/+git/launchpad-buildd/+merge/455733

This is for compatibility with future environments where we use unified cgroup2.  (However, we should keep using systemd.unified_cgroup_hierarchy=false until we drop support for building xenial; see https://bugs.launchpad.net/ubuntu/xenial/+source/systemd/+bug/1962332.)
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-buildd:cgroup2 into launchpad-buildd:master.

diff --git a/debian/changelog b/debian/changelog
index 3b5aa0a..7fdec1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+launchpad-buildd (236) UNRELEASED; urgency=medium
+
+  * Add lxc.cgroup2.* configuration, for compatibility with future
+    environments where we use unified cgroup2.  (However, we should keep
+    using systemd.unified_cgroup_hierarchy=false until we drop support for
+    building xenial; see
+    https://bugs.launchpad.net/ubuntu/xenial/+source/systemd/+bug/1962332.)
+
+ -- Colin Watson <cjwatson@xxxxxxxxxx>  Thu, 16 Nov 2023 16:06:07 +0000
+
 launchpad-buildd (235) focal; urgency=medium
 
   * sourcepackagerecipe: Create /home/buildd inside the chroot if it doesn't
diff --git a/lpbuildd/target/lxd.py b/lpbuildd/target/lxd.py
index 832537a..3d66765 100644
--- a/lpbuildd/target/lxd.py
+++ b/lpbuildd/target/lxd.py
@@ -428,6 +428,8 @@ class LXD(Backend):
             ("lxc.cap.drop", "sys_time sys_module"),
             ("lxc.cgroup.devices.deny", ""),
             ("lxc.cgroup.devices.allow", ""),
+            ("lxc.cgroup2.devices.deny", ""),
+            ("lxc.cgroup2.devices.allow", ""),
             ("lxc.mount.auto", ""),
             ("lxc.mount.auto", "proc:rw sys:rw"),
             (
diff --git a/lpbuildd/target/tests/test_lxd.py b/lpbuildd/target/tests/test_lxd.py
index a5caba0..024c900 100644
--- a/lpbuildd/target/tests/test_lxd.py
+++ b/lpbuildd/target/tests/test_lxd.py
@@ -307,6 +307,8 @@ class TestLXD(TestCase):
             ("lxc.cap.drop", "sys_time sys_module"),
             ("lxc.cgroup.devices.deny", ""),
             ("lxc.cgroup.devices.allow", ""),
+            ("lxc.cgroup2.devices.deny", ""),
+            ("lxc.cgroup2.devices.allow", ""),
             ("lxc.mount.auto", ""),
             ("lxc.mount.auto", "proc:rw sys:rw"),
             (