From 726dda2019925acd6911c4af2699b9b5ce9c699d 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 b19f6cad85ee..e5d024fc49f1 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 7a767af64c0f..d67a83866475 100644 --- a/install.sh.sha256sum +++ b/install.sh.sha256sum @@ -1 +1 @@ -10adf00df73b55e10b0e17dbf423f3b2707b8540c90cfa8b07c34f9688c23a30 install.sh +d47b314676633ab6989c99c2c15ddd0660b961da47919fe7d7019a287b56886a install.sh