1 files changed, 14 insertions, 9 deletions

diff --git a/sliceweasel.lib.sh b/sliceweasel.lib.sh
index bbaed78..3c54841 100755
--- a/sliceweasel.lib.sh
+++ b/sliceweasel.lib.sh
@@ -55,12 +55,12 @@ get_total_io()
 
 root_write()
 {
-    $AS_ROOT sh -c 'cat > "$1"' sh "$1"
+    $AS_ROOT sh -c 'cat > "$1"' sh "$1" || true
 }
 
 join_group()
 {
-    GROUP_DIR=/sys/fs/cgroup/"$1"
+    GROUP_DIR="$1"
     [ -d "$GROUP_DIR" ] || $AS_ROOT mkdir "$GROUP_DIR"
     echo $$ | root_write "$GROUP_DIR"/cgroup.procs
 }
@@ -68,13 +68,15 @@ join_group()
 add_subtree_controller()
 {
     local group="$1" controller="$2" control_file
-    control_file=$(realpath -e "/sys/fs/cgroup/$group/cgroup.subtree_control") || return
-    case "$control_file" in
-        /sys/fs/cgroup/cgroup.subtree_control) ;;
-        *) add_subtree_controller "$group"/.. "$2" ;;
+    control_file="$group/cgroup.subtree_control"
+
+    [ "$group" ] && [ "$controller" ] && [ -d "$group" ] && [ -e "$control_file" ] || return
+
+    case "$group" in
+        /sys/fs/cgroup) ;;
+        *) add_subtree_controller "$(realpath "$group/..")" "$2" ;;
     esac
 
-    [ "$1" ] && [ "$2" ] && [ -e "$control_file" ] || return
     if ! grep -qe "\\b${controller}\\b" "$control_file"
     then
         echo +"$controller" | root_write "$control_file"
@@ -83,9 +85,12 @@ add_subtree_controller()
 
 set_max()
 {
-    add_subtree_controller "$1"/.. "$2"
     max_file=$group/$2.max
-    [ -e "$max_file" ] || return
+    if [ ! -e "$max_file" ]
+    then
+        add_subtree_controller "$1"/.. "$2"
+        [ -e "$max_file" ] || return
+    fi
     printf '%s\n' "$3" | root_write "$max_file"
 }