From fbc60181a94f51c77fe194c92cbd5207e2b07d52 Mon Sep 17 00:00:00 2001 From: Faustin Lammler Date: Mon, 11 Mar 2024 16:23:16 +0100 Subject: [PATCH 1/3] Missing ssh option for recent OS Option needed on more recent OS to support old keys (implemented on Debian12). --- buildbot/runvm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildbot/runvm b/buildbot/runvm index fcd168ac..f346b7a5 100755 --- a/buildbot/runvm +++ b/buildbot/runvm @@ -64,6 +64,8 @@ my $opt_win; # doesn't really give any additional security. my @ssh_cmd_prefix= ($ssh_exec, '-t', '-t', '-o', 'UserKnownHostsFile=/dev/null', + '-o', 'PubkeyAcceptedKeyTypes=ssh-dss', + '-o', 'HostKeyAlgorithms=ssh-dss', '-o', 'StrictHostKeyChecking=no', '-o', 'LogLevel=ERROR'); From 2d6e768d4f7cc4953edebbcceb38b22cd24a587e Mon Sep 17 00:00:00 2001 From: Faustin Lammler Date: Mon, 11 Mar 2024 16:24:33 +0100 Subject: [PATCH 2/3] New qemu-img version needs this qemu-img version 7.2.9 (Debian12) --- buildbot/runvm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildbot/runvm b/buildbot/runvm index f346b7a5..42189b60 100755 --- a/buildbot/runvm +++ b/buildbot/runvm @@ -540,7 +540,7 @@ my $retries= 0; for (;;) { if (defined($opt_baseimage)) { my $img= (defined($opt_work_image) ? $opt_work_image : $image); - my $res= system_with_print($qimg_exe, 'create', '-o', 'compat=0.10', '-b', $opt_baseimage, '-f', 'qcow2', $img); + my $res= system_with_print($qimg_exe, 'create', '-o', 'compat=0.10', '-b', $opt_baseimage, '-f', 'qcow2', '-F', 'qcow2', $img); if ($res) { print STDERR "Failed to clone base image, aborting\n"; exit 1; From e68c850df8fa0a4a9b6f708abed7ba5f4a969fd3 Mon Sep 17 00:00:00 2001 From: Faustin Lammler Date: Mon, 11 Mar 2024 16:25:07 +0100 Subject: [PATCH 3/3] Typo --- buildbot/runvm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildbot/runvm b/buildbot/runvm index 42189b60..a1f3bae8 100755 --- a/buildbot/runvm +++ b/buildbot/runvm @@ -150,7 +150,7 @@ Available options: of qemu-img(1). IMG is not modified in any way. This way, the booted image can be discarded after use, so that each use of IMG is using the same reference image with no risk - of "polution" between different invocations. + of "pollution" between different invocations. Note that this DELETES any existing image of the same name as the one specified on the command line to boot! It will be replaced with the image created as a copy of IMG,