X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.functions;h=f528d30331592d8b3f8aaf593225530e1858f2ca;hb=01a0c0794f07d3950dee13ac1b03f8625d5ad318;hp=e8252712f1b72a0e4ca9e00edafc0f4df72fc9a7;hpb=c46a6c6428e662683d0e9161de5f37f0d5b1e242;p=util-vserver.git diff --git a/scripts/vserver.functions b/scripts/vserver.functions index e825271..f528d30 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -843,7 +843,7 @@ function prepareInit pushd "$1/vdir" >/dev/null case "$INITSTYLE" in sysv) - local -a dirs=( $($_CHROOT_SH realpath /var/run /var/lock || :) ) + local -a dirs=( $($_CHROOT_SH realpath /var/run /var/lock | $_SED 's!^/*!!' || :) ) local dir for dir in "${dirs[@]}"; do $_FIND $dir ! -type d -print0 | xargs -0r $_CHROOT_SH rm @@ -1474,15 +1474,18 @@ 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=( $($_SED '/^#/d;/^ns[[:space:]]/d;s/[[:space:]].*//' /proc/cgroups) ) + 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