fix segmentation fault if file does not exist
[util-vserver.git] / scripts / vserver.functions
index f528d30..95ada0d 100644 (file)
@@ -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
@@ -1478,12 +1486,12 @@ function _generateCgroupOptions
     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) )
+       CGROUP_SUBSYS=( $($_AWK '/^#/ { next; } $1 == "ns" { next; } $4 != "0" { print $1; }' /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
+    elif test -d /sys/fs/cgroup; then
        CGROUP_MNT=/sys/fs/cgroup
        CGROUP_MNT_PER_SS=1
     fi