Fix memory cgroup check on kernels without v1 controller support

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Fix memory cgroup check on kernels without v1 controller support
1c6dc31b · Brad Davidson · Brad Davidson · 0867baa4 · 1c6dc31b · 1c6dc31b
Commit 1c6dc31b authored Feb 24, 2025 by Brad Davidson Committed by Brad Davidson Feb 27, 2025
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

install.sh install.sh +1 -2

install.sh.sha256sum install.sh.sha256sum +1 -1

No files found.
--- a/install.sh
+++ b/install.sh
@@ -1112,8 +1112,7 @@ has_working_xtables() {
 # --- startup systemd or openrc service ---
 service_enable_and_start() {
-    if [ -f "/proc/cgroups" ] && [ "$(grep memory /proc/cgroups | while read -r n n n enabled; do echo $enabled; done)" -eq 0 ];
+    if ! grep -qs memory /sys/fs/cgroup/cgroup.controllers && ! [ "$(grep -s memory /proc/cgroups | while read -r n n n enabled; do echo $enabled; done)" == "0" ]; then
-    then
        info 'Failed to find memory cgroup, you may need to add "cgroup_memory=1 cgroup_enable=memory" to your linux cmdline (/boot/cmdline.txt on a Raspberry Pi)'
    fi

--- a/install.sh.sha256sum
+++ b/install.sh.sha256sum
-b0715fb49a4a1d32241ac23c222a1d343baa1f2846f25032b306d1b30dbacd15  install.sh
+b699722c5ce5896781fd0373f7c5de57555c5121cd1c6014d27afa56d98f5c53  install.sh