about summary refs log tree commit diff
path: root/nixos/modules/virtualisation
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-01-08 00:23:35 +0100
committerGitHub <noreply@github.com>2021-01-08 00:23:35 +0100
commit58514b34283712c751278f6fd133f88ffced7135 (patch)
tree7e265bf986d9652b0bc63dc0521c7b893c7f1626 /nixos/modules/virtualisation
parent594ba151ca70acba4b219f136cb98a32541fdf48 (diff)
parent30ccbe8eec38870db7fc6d1e7c173e92fb835c96 (diff)
Merge pull request #108380 from Patryk27/fixes/lxd-cgroup-v2
nixos/lxd: disable cgroup v2 when LXD is active
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r--nixos/modules/virtualisation/lxd.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix
index 3958fc2c1d7c5..103e689abae85 100644
--- a/nixos/modules/virtualisation/lxd.nix
+++ b/nixos/modules/virtualisation/lxd.nix
@@ -100,6 +100,10 @@ in
       packages = [ cfg.lxcPackage ];
     };
 
+    # TODO: remove once LXD gets proper support for cgroupsv2
+    # (currently most of the e.g. CPU accounting stuff doesn't work)
+    systemd.enableUnifiedCgroupHierarchy = false;
+
     systemd.services.lxd = {
       description = "LXD Container Management Daemon";