From ba95ce6cb6ab2f7ca619edf02cb8e70954cbf81e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 1 Jan 2026 19:52:43 +0100
Subject: populate: derive socket name from target host

---
 pkgs/populate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/populate/default.nix b/pkgs/populate/default.nix
index a5b3ebe..d2a06a2 100644
--- a/pkgs/populate/default.nix
+++ b/pkgs/populate/default.nix
@@ -272,7 +272,7 @@ let
     exec ${openssh}/bin/ssh \
         ${concatMapStringsSep " " quote (mkUserPortSSHOpts target)} \
         -o ControlMaster=auto \
-        -o ControlPath="$TMPDIR"/ssh-%r@$h:%p.sock \
+        -o ControlPath="$TMPDIR"/ssh-%r@%h:%p.sock \
         -o ControlPersist=1h \
         -T \
         ${concatMapStringsSep " " quote target.extraOptions} \
@@ -295,5 +295,5 @@ writers.writeDash "populate.${target.host}" ''
   ${optionalString backup (do-backup { inherit target; })}
   ${concatStringsSep "\n" (mapAttrsToList (populate target) source)}
 
-  ${ssh' target} -q -O stop dummy
+  ${ssh' target} -q -O stop ${quote target.host}
 ''
-- 
cgit v1.2.3