From 649678bd89695bc3605a360bbe3f9557447d19f2 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Mon, 12 Aug 2024 23:57:15 +0000 Subject: [PATCH] Fix k3s-killall.sh support for custom data dir Signed-off-by: Brad Davidson --- install.sh | 2 +- install.sh.sha256sum | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 84a6215a146d..b08e6054a4ea 100755 --- a/install.sh +++ b/install.sh @@ -831,7 +831,7 @@ remove_interfaces() { } getshims() { - ps -e -o pid= -o args= | sed -e 's/^ *//; s/\s\s*/\t/;' | grep -w 'k3s/data/[^/]*/bin/containerd-shim' | cut -f1 + ps -e -o pid= -o args= | sed -e 's/^ *//; s/\s\s*/\t/;' | grep -w "${K3S_DATA_DIR}"'/data/[^/]*/bin/containerd-shim' | cut -f1 } killtree $({ set +x; } 2>/dev/null; getshims; set -x) diff --git a/install.sh.sha256sum b/install.sh.sha256sum index 32a040820df6..237fa59e599b 100644 --- a/install.sh.sha256sum +++ b/install.sh.sha256sum @@ -1 +1 @@ -68ae766b4c4fd2c8032f712cdd346c8f9d1ae60eaeb4736a1155effda44ea23d install.sh +f60c3d8940dfc896f7d83aaf57726c91cf21afc4bca40036472df108d9700b4b install.sh