X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvserver.functions;h=808fcd1800960ff3115feac0d9810bb733c3b051;hb=036b3a89556ef244feea9156ed3381e29a3e7e6a;hp=e00ce74cc12b69ca2fc89bfb1a2a00c811be19f8;hpb=6fdb192300e968e4a7db93060e18560a4429729e;p=util-vserver.git diff --git a/scripts/vserver.functions b/scripts/vserver.functions index e00ce74..808fcd1 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -1416,11 +1416,19 @@ function _namespaceCleanup done done + # keep cgroup mount points + list=( "${list[@]}" "${CGROUP_MNT}" ) + if test -n "$CGROUP_MNT_PER_SS"; then + for ss in "${CGROUP_SUBSYS[@]}"; do + list=( "${list[@]}" "${CGROUP_MNT}/${ss}" ) + done + fi + local -a list_umount while read -r dev path opts; do test -n "$path" || continue - for i in "$root" /dev /proc; do - path_dir="${path}/" + path_dir="${path}/" + for i in "$root" /dev /proc /sys; do test "${path_dir#${i}/}" != "${path_dir}" && continue 2 done for i in "${list[@]}" /; do