Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adapt runvm #181

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adapt runvm #181

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbc6018
Missing ssh option for recent OS
fauust Mar 11, 2024
2d6e768
New qemu-img version needs this
fauust Mar 11, 2024
e68c850
Typo
fauust Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions buildbot/runvm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down Expand Up @@ -148,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,
Expand Down Expand Up @@ -538,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;
Expand Down