From: Daniel Hokka Zakrisson Date: Wed, 16 Mar 2011 13:16:57 +0000 (+0100) Subject: Add base to all the right spots. X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38d5f3551ce73e6b1d45fe219fa7951e788b20fd;p=util-vserver.git Add base to all the right spots. --- diff --git a/doc/configuration.xml b/doc/configuration.xml index 4133052..e03f92d 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -339,6 +339,12 @@ contents of this file. The default is to put each guest in a cgroup named the same thing as the guest. + + +If this file exists, all cgroups will be created underneath this directory +in the cgroup mount point. + + diff --git a/scripts/vserver.functions b/scripts/vserver.functions index 1dc880a..5381d82 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -1542,7 +1542,8 @@ function _handleCgroup for i in "$dir"/*; do f="${i##*/}" test "$f" != mnt -a "$f" != subsys -a \ - "$f" != inherit -a "$f" != name || continue + "$f" != inherit -a "$f" != name -a "$f" != base \ + || continue cat "$i" > "$CGROUP_MNT/$CGROUP_BASE$name/$f" done fi