2ae3c9
Fedora specific configuration - we want to mount all controllers by default for libvirt.
2ae3c9
2ae3c9
diff -up libcgroup-0.34/samples/cgconfig.conf.orig libcgroup-0.34/samples/cgconfig.conf
2ae3c9
--- libcgroup-0.34/samples/cgconfig.conf.orig	2009-03-04 10:40:06.000000000 +0100
2ae3c9
+++ libcgroup-0.34/samples/cgconfig.conf	2009-10-19 10:17:37.000000000 +0200
2ae3c9
@@ -10,39 +10,8 @@
2ae3c9
 #  WITHOUT ANY WARRANTY; without even the implied warranty of
2ae3c9
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
2ae3c9
 #
2ae3c9
-#group daemons/www {
2ae3c9
-#	perm {
2ae3c9
-#		task {
2ae3c9
-#			uid = root;
2ae3c9
-#			gid = webmaster;
2ae3c9
-#		}
2ae3c9
-#		admin {
2ae3c9
-#			uid = root;
2ae3c9
-#			gid = root;
2ae3c9
-#		}
2ae3c9
-#	}
2ae3c9
-#	cpu {
2ae3c9
-#		cpu.shares = 1000;
2ae3c9
-#	}
2ae3c9
-#}
2ae3c9
 #
2ae3c9
-#group daemons/ftp {
2ae3c9
-#	perm {
2ae3c9
-#		task {
2ae3c9
-#			uid = root;
2ae3c9
-#			gid = ftpmaster;
2ae3c9
-#		}
2ae3c9
-#		admin {
2ae3c9
-#			uid = root;
2ae3c9
-#			gid = root;
2ae3c9
-#		}
2ae3c9
-#	}
2ae3c9
-#	cpu {
2ae3c9
-#		cpu.shares = 500;
2ae3c9
-#	}
2ae3c9
-#}
2ae3c9
-#
2ae3c9
-#mount {
2ae3c9
-#	cpu = /mnt/cgroups/cpu;
2ae3c9
-#	cpuacct = /mnt/cgroups/cpuacct;
2ae3c9
-#}
2ae3c9
+# By default, we expect systemd mounts everything on boot,
2ae3c9
+# so there is not much to do.
2ae3c9
+# See man cgconfig.conf for further details, how to create groups
2ae3c9
+# on system boot using this file.
2ae3c9
+
2ae3c9
diff -up libcgroup-0.35.1/samples/cgconfig.sysconfig.orig libcgroup-0.35.1/samples/cgconfig.sysconfig
2ae3c9
--- libcgroup-0.35.1/samples/cgconfig.sysconfig.orig	2010-03-09 14:56:34.000000000 +0100
2ae3c9
+++ libcgroup-0.35.1/samples/cgconfig.sysconfig	2010-03-09 16:30:12.000000000 +0100
2ae3c9
@@ -5,8 +5,6 @@
2ae3c9
 # controller to limit cpu.shares of this default group and allowing some more
2ae3c9
 # important group take most of the CPU.
2ae3c9
 #
2ae3c9
-# By default, create these groups:
2ae3c9
-CREATE_DEFAULT=yes
2ae3c9
-
2ae3c9
-# Uncomment following line to disable creation of the default group on startup:
2ae3c9
-# CREATE_DEFAULT=no
2ae3c9
+# By default, do not create these groups:
2ae3c9
+# CREATE_DEFAULT=yes
2ae3c9
+CREATE_DEFAULT=no