summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyeon Kim <simnalamburt@gmail.com>2021-09-14 16:51:17 +0900
committerMatthew Heon <mheon@redhat.com>2021-09-16 09:42:14 -0400
commit33591c3ef4657f2f0512e018f916f13e5612d364 (patch)
treef5ad9ed6b043ff98693834aa98dad11ffe4fadc4
parent1af0f8934ce1d4bbdedd6583579ca0eb6469e831 (diff)
downloadpodman-33591c3ef4657f2f0512e018f916f13e5612d364.tar.gz
podman-33591c3ef4657f2f0512e018f916f13e5612d364.tar.bz2
podman-33591c3ef4657f2f0512e018f916f13e5612d364.zip
Search gvproxy with config.FindHelperBinary()
Closes #11531 [NO TESTS NEEDED] Signed-off-by: Hyeon Kim <simnalamburt@gmail.com>
-rw-r--r--pkg/machine/qemu/machine.go10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index 5d8c6e6ce..d5f538594 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -15,6 +15,7 @@ import (
"strings"
"time"
+ "github.com/containers/common/pkg/config"
"github.com/containers/podman/v3/pkg/machine"
"github.com/containers/podman/v3/pkg/rootless"
"github.com/containers/podman/v3/utils"
@@ -627,9 +628,12 @@ func CheckActiveVM() (bool, string, error) {
// startHostNetworking runs a binary on the host system that allows users
// to setup port forwarding to the podman virtual machine
func (v *MachineVM) startHostNetworking() error {
- // TODO we may wish to configure the directory in containers common
- binary := filepath.Join("/usr/libexec/podman/", machine.ForwarderBinaryName)
- if _, err := os.Stat(binary); err != nil {
+ cfg, err := config.Default()
+ if err != nil {
+ return err
+ }
+ binary, err := cfg.FindHelperBinary(machine.ForwarderBinaryName, false)
+ if err != nil {
return err
}