diff options
| author | baude <baude@redhat.com> | 2021-03-29 15:21:39 -0500 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2021-03-29 20:20:39 -0500 |
| commit | b6089a5e9967b239348afcce452c8aa82df53ccf (patch) | |
| tree | f35f466acf36c3806fea63f62620b7256a208820 /pkg/machine/qemu | |
| parent | 4fe1ce154f364932129fb6d53c9dbe5b374ed38d (diff) | |
| download | podman-b6089a5e9967b239348afcce452c8aa82df53ccf.tar.gz podman-b6089a5e9967b239348afcce452c8aa82df53ccf.tar.bz2 podman-b6089a5e9967b239348afcce452c8aa82df53ccf.zip | |
resolve proper aarch64 image names
when automatically downloading fcos for the Apple M1, we needed
to replace a statically defined URL with the dynamically
determined one.
also, it appears boolean qemu options `server` and `onwait` are
not defined as `server=on` and `wait=off`.
[NO TESTS NEEDED]
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/machine/qemu')
| -rw-r--r-- | pkg/machine/qemu/machine.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index fe155750f..dddf9cf94 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -83,7 +83,7 @@ func NewMachine(opts machine.InitOptions) (machine.VM, error) { return nil, err } vm.QMPMonitor = monitor - cmd = append(cmd, []string{"-qmp", monitor.Network + ":/" + monitor.Address + ",server,nowait"}...) + cmd = append(cmd, []string{"-qmp", monitor.Network + ":/" + monitor.Address + ",server=on,wait=off"}...) // Add network cmd = append(cmd, "-nic", "user,model=virtio,hostfwd=tcp::"+strconv.Itoa(vm.Port)+"-:22") @@ -96,7 +96,7 @@ func NewMachine(opts machine.InitOptions) (machine.VM, error) { // Add serial port for readiness cmd = append(cmd, []string{ "-device", "virtio-serial", - "-chardev", "socket,path=" + virtualSocketPath + ",server,nowait,id=" + vm.Name + "_ready", + "-chardev", "socket,path=" + virtualSocketPath + ",server=on,wait=off,id=" + vm.Name + "_ready", "-device", "virtserialport,chardev=" + vm.Name + "_ready" + ",name=org.fedoraproject.port.0"}...) vm.CmdLine = cmd return vm, nil |