Commit ece812ce authored by Tomas Leypold's avatar Tomas Leypold
Browse files

k3s: fix containerd-shim process matching in killall script

parent 53219405

pkgs/applications/networking/cluster/k3s/builder.nix

+2 −1
Original line number Diff line number Diff line
@@ -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)