Add base to all the right spots.
authorDaniel Hokka Zakrisson <daniel@hozac.com>
Wed, 16 Mar 2011 13:16:57 +0000 (14:16 +0100)
committerDaniel Hokka Zakrisson <daniel@hozac.com>
Wed, 16 Mar 2011 13:16:57 +0000 (14:16 +0100)
doc/configuration.xml
scripts/vserver.functions

index 4133052..e03f92d 100644 (file)
@@ -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.
         </description>
       </scalar>
+      <scalar name="base">
+       <description>
+If this file exists, all cgroups will be created underneath this directory
+in the cgroup mount point.
+        </description>
+      </scalar>
     </collection>
   </collection>
     
index 1dc880a..5381d82 100644 (file)
@@ -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