mirror of
https://github.com/k3s-io/k3s.git
synced 2026-06-11 01:44:08 -04:00
Fix memory cgroup check on kernels without v1 controller support
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
parent
0867baa46f
commit
1c6dc31b1a
2 changed files with 2 additions and 3 deletions
|
|
@ -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 ];
|
||||
then
|
||||
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
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
b0715fb49a4a1d32241ac23c222a1d343baa1f2846f25032b306d1b30dbacd15 install.sh
|
||||
b699722c5ce5896781fd0373f7c5de57555c5121cd1c6014d27afa56d98f5c53 install.sh
|
||||
|
|
|
|||
Loading…
Reference in a new issue