Fix k3s-killall.sh support for custom data dir

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
dereknola · Aug 13, 2024 · 649678b · 649678b
1 parent 38df767
commit 649678b
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 @@
-68ae766b4c4fd2c8032f712cdd346c8f9d1ae60eaeb4736a1155effda44ea23d  install.sh
+f60c3d8940dfc896f7d83aaf57726c91cf21afc4bca40036472df108d9700b4b  install.sh