Don't join the cpuset controller with cpu/cpuacct

This works around the problem described here: http://lists.freedesktop.org/archives/systemd-devel/2012-September/006648.html
2012-09-21 22:56:13 -04:00 · 2012-09-21 22:56:13 -04:00 · 1ad655bdcf
commit 1ad655bdcf
parent 4fa9b4b257
1 changed files with 7 additions and 0 deletions
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@ -340,6 +340,13 @@ in
      [ { source = units;
          target = "systemd/system";
        }
+        { source = pkgs.writeText "systemd.conf"
+            ''
+              [Manager]
+              JoinControllers=cpu,cpuacct net_cls,netprio
+            '';
+          target = "systemd/system.conf";
+        }
        { source = pkgs.writeText "journald.conf"
            ''
              [Journal]