Fix k3s-killall.sh support for custom data dir

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond · Aug 12, 2024 · 726dda2 · 726dda2
1 parent 22fb704
commit 726dda2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -1 +1 @@
-10adf00df73b55e10b0e17dbf423f3b2707b8540c90cfa8b07c34f9688c23a30  install.sh
+d47b314676633ab6989c99c2c15ddd0660b961da47919fe7d7019a287b56886a  install.sh