aboutsummaryrefslogtreecommitdiffstats
path: root/pkgs/populate/default.nix
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2026-01-01 19:52:43 +0100
committertv <tv@krebsco.de>2026-01-01 19:52:43 +0100
commitba95ce6cb6ab2f7ca619edf02cb8e70954cbf81e (patch)
treeb44a32b439bbc75e2483a7ee31c62030fad6d06e /pkgs/populate/default.nix
parenta753c741e741d2a2edca190130e5b20a57c33773 (diff)
populate: derive socket name from target hostHEADmaster
Diffstat (limited to 'pkgs/populate/default.nix')
-rw-r--r--pkgs/populate/default.nix4
1 files changed, 2 insertions, 2 deletions
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}
''