container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-20 01:03:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

podman machine start: lookup qemu path again if not found

Browse source 
We store the full path to qemu in the machine config. When the path
changes on the host the machine can longer be started. To fix it we get
the path again when we fail to start the machine due the missing binary.

We want to store and use the full path first because otherwise existing
machines can break when the qemu version changed.

[NO NEW TESTS NEEDED] We still have no machine tests.

Fixes #13394

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger 2022-03-23 18:22:18 +01:00
parent f049cba47c
commit 59dc70bb42
No known key found for this signature in database
GPG key ID: EB145DD938A3CAF2
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkg/machine/qemu/machine.go
View file

@ -98,7 +98,7 @@ func (p *Provider) NewMachine(opts machine.InitOptions) (machine.VM, error) {
return nil, err
}
cmd := append([]string{execPath})
cmd := []string{execPath}
// Add memory
cmd = append(cmd, []string{"-m", strconv.Itoa(int(vm.Memory))}...)
// Add cpus
@ -436,7 +436,23 @@ func (v *MachineVM) Start(name string, _ machine.StartOptions) error {
_, err = os.StartProcess(v.CmdLine[0], cmd, attr)
if err != nil {
return err
// check if qemu was not found
if !errors.Is(err, os.ErrNotExist) {
return err
}
// lookup qemu again maybe the path was changed, https://github.com/containers/podman/issues/13394
cfg, err := config.Default()
if err != nil {
return err
}
cmd[0], err = cfg.FindHelperBinary(QemuCommand, true)
if err != nil {
return err
}
_, err = os.StartProcess(cmd[0], cmd, attr)
if err != nil {
return err
}
}
fmt.Println("Waiting for VM ...")
socketPath, err := getRuntimeDir()