Fix k3s-killall.sh support for custom data dir

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/10710/head
Brad Davidson 4 months ago committed by Brad Davidson
parent 38df76708d
commit 649678bd89

@ -831,7 +831,7 @@ remove_interfaces() {
} }
getshims() { 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) killtree $({ set +x; } 2>/dev/null; getshims; set -x)

@ -1 +1 @@
68ae766b4c4fd2c8032f712cdd346c8f9d1ae60eaeb4736a1155effda44ea23d install.sh f60c3d8940dfc896f7d83aaf57726c91cf21afc4bca40036472df108d9700b4b install.sh

Loading…
Cancel
Save