k3s: fix containerd-shim process matching in killall script (#453612)

2025-10-21 17:42:03 +00:00
parent bbc5eb3e86 ece812ce6d
commit fd3340d065
1 changed files with 2 additions and 1 deletions
@@ -203,8 +203,9 @@ let

    # Let killall expect "containerd-shim" in the Nix store
    substituteInPlace install.sh \
+      --replace-fail '"''${K3S_DATA_DIR}"' "" \
      --replace-fail '/data/[^/]*/bin/containerd-shim' \
-        '/nix/store/.*k3s-containerd.*/bin/containerd-shim'
+        '/nix/store/[^/]*k3s-containerd[^/]*/bin/containerd-shim'

    remove_matching_line() {
      line_to_delete=$(grep -n "$1" install.sh | cut -d : -f 1 || true)