forked from M-Labs/nix-scripts
wfvm: remove duplicated SSH code
This commit is contained in:
parent
75c44b0369
commit
088403cf6f
|
@ -1,9 +1,4 @@
|
||||||
{ pkgs
|
{ pkgs, qemuMem }:
|
||||||
, qemuMem
|
|
||||||
, sshUser ? "user"
|
|
||||||
, sshPassword ? "user"
|
|
||||||
,
|
|
||||||
}:
|
|
||||||
|
|
||||||
with pkgs;
|
with pkgs;
|
||||||
|
|
||||||
|
@ -39,25 +34,8 @@ let
|
||||||
in
|
in
|
||||||
"${qemu_kvm}/bin/qemu-system-x86_64 ${argStr}";
|
"${qemu_kvm}/bin/qemu-system-x86_64 ${argStr}";
|
||||||
|
|
||||||
# Pass empty config file to prevent ssh from failing to create ~/.ssh
|
|
||||||
sshOpts = "-F /dev/null -o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=\$TMP/known_hosts";
|
|
||||||
sshWithQuotes = quotes: cmd: ''
|
|
||||||
echo ssh windows ${quotes}${cmd}${quotes}
|
|
||||||
${sshpass}/bin/sshpass -p${sshPassword} -- \
|
|
||||||
${openssh}/bin/ssh -np 2022 ${sshOpts} \
|
|
||||||
${sshUser}@localhost \
|
|
||||||
${quotes}${cmd}${quotes}
|
|
||||||
'';
|
|
||||||
ssh = sshWithQuotes "'";
|
|
||||||
scp = src: target: ''
|
|
||||||
echo "Copy ${src} to ${target}"
|
|
||||||
${sshpass}/bin/sshpass -p${sshPassword} -- \
|
|
||||||
${openssh}/bin/scp -P 2022 ${sshOpts} \
|
|
||||||
"${src}" "${sshUser}@localhost:${target}"
|
|
||||||
'';
|
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
inherit qemu-img runQemu ssh sshWithQuotes scp;
|
inherit qemu-img runQemu;
|
||||||
inputs = [ qemu_kvm openssh sshpass ];
|
inputs = [ qemu_kvm ];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue