summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-14 07:07:55 -0400
committerGitHub <noreply@github.com>2021-09-14 07:07:55 -0400
commitad26684856551251100b945305f91246888ef153 (patch)
tree5ac2a45f72fcba9bad8f5462a77950292bac7f0c
parentb603c7a4b91d30b33ce987740156f46804f24074 (diff)
parent072b061b4e324821754258e5a3d8c1a293588820 (diff)
downloadpodman-ad26684856551251100b945305f91246888ef153.tar.gz
podman-ad26684856551251100b945305f91246888ef153.tar.bz2
podman-ad26684856551251100b945305f91246888ef153.zip
Merge pull request #11449 from simnalamburt/gvproxy-path
Make gvproxy path configurable with containers.conf
-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
}