From 2678ff37264b7951e7b7309d5ad892061bcd019a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 30 Jul 2012 13:49:18 -0400
Subject: [PATCH] Use /sys/fs/cgroup instead of /dev/cgroup

---
 modules/services/system/cgroups.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/services/system/cgroups.nix b/modules/services/system/cgroups.nix
index 199d12268ce..5d5777909e9 100644
--- a/modules/services/system/cgroups.nix
+++ b/modules/services/system/cgroups.nix
@@ -37,14 +37,14 @@ in
       default =
         ''
           mount {
-            cpu = /dev/cgroup/cpu;
+            cpu = /sys/fs/cgroup/cpu;
           }
         '';
       example =
         ''
           mount {
-            cpu = /dev/cgroup/cpu;
-            cpuacct = /dev/cgroup/cpuacct;
+            cpu = /sys/fs/cgroup/cpu;
+            cpuacct = /sys/fs/cgroup/cpuacct;
           }
 
           # Create a "www" cgroup with a lower share of the CPU (the
@@ -105,10 +105,16 @@ in
 
         description = "Control groups daemon";
 
-        path = [ pkgs.libcgroup pkgs.procps ];
+        path = [ pkgs.libcgroup pkgs.procps pkgs.utillinux ];
       
         preStart =
           ''
+            if [ -d /sys/fs/cgroup ]; then
+              if ! mountpoint -q /sys/fs/cgroup; then
+                mount -t tmpfs -o mode=755 /dev/cgroup /sys/fs/cgroup
+              fi
+            fi
+          
             cgclear || true
 
             # Mount the cgroup hierarchies.  Note: we refer to the