From ece812ce6d45de7ce5d76ed2a005d0b1a7ca9853 Mon Sep 17 00:00:00 2001
From: Tomas Leypold <tomas@leypold.cz>
Date: Sun, 19 Oct 2025 22:38:13 +0200
Subject: [PATCH] k3s: fix containerd-shim process matching in killall script

---
 pkgs/applications/networking/cluster/k3s/builder.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index f4f3dff1d4f3..aa4814fc3d3c 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -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)