X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.functions;h=1dc880a73a5111d42a983bf307af803a2e4e4c50;hb=e43cea82e4ad142e96689656d952d7f3c2f8c68b;hp=b90596820ddea161401438cdc5677e30b4295bd5;hpb=9e9bcf76d468cce2a545026c8e5aca3a2ac9507f;p=util-vserver.git diff --git a/scripts/vserver.functions b/scripts/vserver.functions index b905968..1dc880a 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -77,6 +77,7 @@ SILENT_OPT= CGROUP_MNT=/dev/cgroup CGROUP_SUBSYS=all declare -a CGROUP_INHERIT=( cpuset.cpus cpuset.mems ) +CGROUP_BASE="" : ${VSERVER_NAME:=$(basename "$VSERVER_DIR")} @@ -112,7 +113,7 @@ function _generateChbindOptions test -n "$_HAVE_INTERFACE_OPTIONS" || _generateInterfaceOptions "$vdir" - if test -e "$vdir"/noncontext -o + if test -e "$vdir"/noncontext -o \ \( -e "$vdir"/spaces/net -a ! -e "$vdir"/ncontext \); then _HAVE_CHBIND_OPTIONS=1 return 0 @@ -804,7 +805,7 @@ function _generateSpaceOptions if test -z "$shared"; then OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --$space ) elif test "$shared" = "0"; then - # Do nothing + : # Do nothing else OPTS_VSPACE_SHARED=( "${OPTS_VSPACE_SHARED[@]}" --$space ) VSPACE_SHARED_CMD=( "${VSPACE_SHARED_CMD[@]}" $_VSPACE --enter "$shared" --$space -- ) @@ -1467,6 +1468,12 @@ function _generateCgroupOptions if test -n "$file"; then _readFileToArray CGROUP_INHERIT "$file" "" fi + findFile file "$__CONFDIR/.defaults/cgroup/base" "" + if test -n "$file"; then + read CGROUP_BASE < "$file" + test "$CGROUP_BASE" != "${CGROUP_BASE%/}" || \ + CGROUP_BASE="${CGROUP_BASE}/" + fi return 0 } @@ -1475,8 +1482,12 @@ function useCgroup { hasCgroup || return 1 test -d "$CGROUP_MNT" || return 1 + memcg="" + if $_VSERVER_INFO - FEATURE memcg; then + memcg=1 + fi test -d "$1/cgroup" -o \ - \( -d "$__CONFDIR/.defaults/cgroup" -a \ + \( \( -d "$__CONFDIR/.defaults/cgroup" -o -n "$memcg" \) -a \ ! -e "$1/nocgroup" \) } @@ -1487,37 +1498,56 @@ function _handleCgroup local dir local name local i + local j local parent useCgroup "$vdir" || return 0 findDir dir "$vdir/cgroup" "$__CONFDIR/.defaults/cgroup" "" - test -d "$dir" || return 0 - if test -r "$dir"/name; then + if test -n "$dir" -a -r "$dir"/name; then read name < "$dir"/name else name="$VSERVER_NAME" fi if test "$action" = "attach"; then - if mkdir "$CGROUP_MNT/$name" 2>/dev/null; then - parent="$CGROUP_MNT/$name" + if test -n "$CGROUP_BASE"; then + local -a dirs=() + i="$CGROUP_MNT/$CGROUP_BASE" + while test "$CGROUP_MNT" != "$i"; do + dirs=( "$i" "${dirs[@]}" ) + i="${i%/*}" + done + for i in "${dirs[@]}"; do + if mkdir "$i" 2>/dev/null; then + parent="${i%/*}" + for j in "${CGROUP_INHERIT[@]}"; do + test -f "$parent/$j" || continue + cat "$parent/$j" > "$i/$j" + done + fi + done + fi + if mkdir "$CGROUP_MNT/$CGROUP_BASE$name" 2>/dev/null; then + parent="$CGROUP_MNT/$CGROUP_BASE$name" parent="${parent%/*}" for i in "${CGROUP_INHERIT[@]}"; do test -f "$parent/$i" || continue - cat "$parent/$i" > "$CGROUP_MNT/$name/$i" + cat "$parent/$i" > "$CGROUP_MNT/$CGROUP_BASE$name/$i" done - shopt -s nullglob - for i in "$dir"/*; do - f="${i##*/}" - test "$f" != mnt -a "$f" != subsys -a \ - "$f" != inherit -a "$f" != name || continue - cat "$i" > "$CGROUP_MNT/$name/$f" - done + if test -n "$dir"; then + shopt -s nullglob + for i in "$dir"/*; do + f="${i##*/}" + test "$f" != mnt -a "$f" != subsys -a \ + "$f" != inherit -a "$f" != name || continue + cat "$i" > "$CGROUP_MNT/$CGROUP_BASE$name/$f" + done + fi fi - echo "$$" > "$CGROUP_MNT/$name/tasks" + echo "$$" > "$CGROUP_MNT/$CGROUP_BASE$name/tasks" elif test "$action" = "destroy"; then rmdir "$CGROUP_MNT/$name" 2>/dev/null || : fi