X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.functions;h=f528d30331592d8b3f8aaf593225530e1858f2ca;hb=01a0c0794f07d3950dee13ac1b03f8625d5ad318;hp=1367676d2e972edb948860115308bdf97c784414;hpb=ec80c7ae48c156ef33f335e51b55f897559495ad;p=util-vserver.git diff --git a/scripts/vserver.functions b/scripts/vserver.functions index 1367676..f528d30 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -1474,16 +1474,19 @@ function _generateCgroupOptions hasCgroup || return 0 - findFile file "$__CONFDIR/.defaults/cgroup/mnt" "" - if test -n "$file"; then - read CGROUP_MNT < "$file" - fi findFile file "$__CONFDIR/.defaults/cgroup/subsys" "" if test -n "$file"; then _readFileToArray CGROUP_SUBSYS "$file" else CGROUP_SUBSYS=( $($_AWK '/^#/ { next; } $1 == "ns" { next; } $4 != "0" { printf "%s%s", s, $1; s=","; }' /proc/cgroups) ) fi + findFile file "$__CONFDIR/.defaults/cgroup/mnt" "" + if test -n "$file"; then + read CGROUP_MNT < "$file" + elif test -d /sys/fs/cgroup -a -d /sys/fs/cgroup/"${CGROUP_SUBSYS[0]}"; then + CGROUP_MNT=/sys/fs/cgroup + CGROUP_MNT_PER_SS=1 + fi findFile file "$__CONFDIR/.defaults/cgroup/inherit" "" if test -n "$file"; then _readFileToArray CGROUP_INHERIT "$file" ""