From 1ad655bdcf49ac078119ba866e0f6d5977e0320c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Sep 2012 22:56:13 -0400
Subject: [PATCH] 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
---
 modules/system/boot/systemd.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index 918c0571ab48..d8b5ee45c7e4 100644
--- 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]