File tree Expand file tree Collapse file tree 2 files changed +12
-2
lines changed Expand file tree Collapse file tree 2 files changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,9 @@ cut_body_after = "" # don't include text from the PR body in the merge commit me
2
2
status = [
3
3
" Evaluate flake.nix" ,
4
4
" check from-nixos [x86_64-linux]" ,
5
+ " check from-nixos-2211 [x86_64-linux]" ,
5
6
" check from-nixos-with-sudo [x86_64-linux]" ,
7
+ " check from-nixos-with-sudo-2211 [x86_64-linux]" ,
6
8
" check treefmt [x86_64-linux]" ,
7
9
" deploy" ,
8
10
" devShell default [x86_64-linux]" ,
Original file line number Diff line number Diff line change @@ -221,6 +221,10 @@ if [[ -n ${ssh_private_key_file-} ]]; then
221
221
ssh_copy_id_args+=(-f)
222
222
fi
223
223
224
+ ssh_settings=$( ssh -G " ${ssh_connection} " )
225
+ ssh_host=$( echo " $ssh_settings " | awk ' /^host / { print $2 }' )
226
+ ssh_port=$( echo " $ssh_settings " | awk ' /^port / { print $2 }' )
227
+
224
228
step Uploading install SSH keys
225
229
until
226
230
ssh-copy-id \
318
322
while timeout_ssh_ -- exit 0; do sleep 1; done
319
323
320
324
# After kexec we explicitly set the user to root@
321
- ssh_connection=" root@${ssh_connection #*@ } "
325
+ ssh_connection=" root@${ssh_host } "
322
326
323
327
# watiting for machine to become available again
324
328
until ssh_ -o ConnectTimeout=10 -- exit 0; do sleep 5; done
@@ -328,7 +332,11 @@ for path in "${!disk_encryption_keys[@]}"; do
328
332
ssh_ " umask 077; cat > $path " < " ${disk_encryption_keys[$path]} "
329
333
done
330
334
331
- pubkey=$( ssh-keyscan -t ed25519 " ${ssh_connection//*@/ } " 2> /dev/null | sed -e ' s/^[^ ]* //' | base64 -w0)
335
+ pubkey=$( ssh-keyscan -p " $ssh_port " -t ed25519 " $ssh_host " 2> /dev/null || {
336
+ echo " ERROR: failed to retrieve host public key for ${ssh_connection} "
337
+ exit 1
338
+ })
339
+ pubkey=$( echo " $pubkey " | sed -e ' s/^[^ ]* //' | base64 -w0)
332
340
333
341
if [[ -z ${disko_script-} ]] && [[ ${build_on_remote-n} == " y" ]]; then
334
342
step Building disko script
You can’t perform that action at this time.
0 commit comments