projects / packages / libcgroup.git / blame
| Commit | Line | Data |
|---|---|---|
| 077903da JR |
1 | diff -ur libcgroup-0.37/samples/cgconfig.conf libcgroup-0.37-conf/samples/cgconfig.conf |
| 2 | --- libcgroup-0.37/samples/cgconfig.conf 2010-10-20 15:59:13.000000000 +0200 | |
| 3 | +++ libcgroup-0.37-conf/samples/cgconfig.conf 2011-02-10 18:05:17.560363010 +0100 | |
| 4 | @@ -10,39 +10,19 @@ | |
| 5 | # WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 6 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | |
| 7 | # | |
| 8 | -#group daemons/www { | |
| 9 | -# perm { | |
| 10 | -# task { | |
| 11 | -# uid = root; | |
| 12 | -# gid = webmaster; | |
| 13 | -# } | |
| 14 | -# admin { | |
| 15 | -# uid = root; | |
| 16 | -# gid = root; | |
| 17 | -# } | |
| 18 | -# } | |
| 19 | -# cpu { | |
| 20 | -# cpu.shares = 1000; | |
| 21 | -# } | |
| 22 | -#} | |
| 23 | +# See man cgconfig.conf for further details. | |
| 24 | # | |
| 25 | -#group daemons/ftp { | |
| 26 | -# perm { | |
| 27 | -# task { | |
| 28 | -# uid = root; | |
| 29 | -# gid = ftpmaster; | |
| 30 | -# } | |
| 31 | -# admin { | |
| 32 | -# uid = root; | |
| 33 | -# gid = root; | |
| 34 | -# } | |
| 35 | -# } | |
| 36 | -# cpu { | |
| 37 | -# cpu.shares = 500; | |
| 38 | -# } | |
| 39 | -#} | |
| 40 | -# | |
| 41 | -#mount { | |
| 42 | -# cpu = /mnt/cgroups/cpu; | |
| 43 | -# cpuacct = /mnt/cgroups/cpuacct; | |
| 44 | -#} | |
| 8a3b0a34 | 45 | +# By default, mount all controllers to /dev/cgroup/<controller> |
| 077903da JR |
46 | + |
| 47 | +mount { | |
| 48 | + blkio = /dev/cgroup/blkio; | |
| 49 | + cpu = /dev/cgroup/cpu; | |
| 50 | + cpuacct = /dev/cgroup/cpuacct; | |
| 51 | + cpuset = /dev/cgroup/cpuset; | |
| 8a3b0a34 | 52 | +# debug = /dev/cgroup/debug; |
| 077903da JR |
53 | + devices = /dev/cgroup/devices; |
| 54 | + freezer = /dev/cgroup/freezer; | |
| 55 | + memory = /dev/cgroup/memory; | |
| 56 | + net_cls = /dev/cgroup/net_cls; | |
| 57 | +} | |
| 58 | + | |
| 59 | diff -ur libcgroup-0.37/samples/cgconfig.sysconfig libcgroup-0.37-conf/samples/cgconfig.sysconfig | |
| 60 | --- libcgroup-0.37/samples/cgconfig.sysconfig 2010-10-20 15:59:13.000000000 +0200 | |
| 61 | +++ libcgroup-0.37-conf/samples/cgconfig.sysconfig 2011-02-10 18:06:29.233508500 +0100 | |
| 62 | @@ -5,8 +5,5 @@ | |
| 63 | # controller to limit cpu.shares of this default group and allowing some more | |
| 64 | # important group take most of the CPU. | |
| 65 | # | |
| 66 | -# By default, create these groups: | |
| 67 | -CREATE_DEFAULT=yes | |
| 68 | - | |
| 69 | -# Uncomment following line to disable creation of the default group on startup: | |
| 70 | -# CREATE_DEFAULT=no | |
| 71 | +# Don't create default group on startup | |
| 72 | +CREATE_DEFAULT=no |