From 353522ef79ee628f46b2044085a98f59f05ee248 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Oct 2012 14:33:01 -0400
Subject: [PATCH] Remove JoinControllers line because upstream reverted joining
 cpuset

---
 modules/system/boot/systemd.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/system/boot/systemd.nix b/modules/system/boot/systemd.nix
index d8b5ee45c7e..4cb0e1cdf1d 100644
--- a/modules/system/boot/systemd.nix
+++ b/modules/system/boot/systemd.nix
@@ -343,7 +343,6 @@ in
         { source = pkgs.writeText "systemd.conf"
             ''
               [Manager]
-              JoinControllers=cpu,cpuacct net_cls,netprio
             '';
           target = "systemd/system.conf";
         }