From 643178c1ec03df481d9e38b84f36f9bd48550ec4 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Wed, 11 Aug 2021 14:30:52 -0500 Subject: Revert "Use static path for gvproxy" This reverts commit 4acc1d685066faa1dc102532ba76a81d3ec6bdc0. [NO TESTS NEEDED] Signed-off-by: Brent Baude --- pkg/machine/qemu/machine.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg/machine') diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index 7b1ebcb03..9cb04ff0a 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -605,9 +605,9 @@ 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 { - binary := filepath.Join("/usr/lib/podman/", machine.ForwarderBinaryName) - if _, err := os.Stat(binary); os.IsNotExist(err) { - return errors.Errorf("unable to find %s", binary) + binary, err := exec.LookPath(machine.ForwarderBinaryName) + if err != nil { + return err } // Listen on all at port 7777 for setting up and tearing // down forwarding -- cgit v1.2.3-54-g00ecf From 9fc9465630123b150d69fb85dcc83805f955cb49 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Wed, 11 Aug 2021 14:35:03 -0500 Subject: Set gvproxy path to /usr/libexec/podman/gvproxy We have reverted the previous patches to look for the gvproxy binary in /usr/lib/podman and have again decided to use /usr/libexec/podman [NO TESTS NEEDED] Signed-off-by: Brent Baude --- pkg/machine/qemu/machine.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkg/machine') diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index 9cb04ff0a..a92892957 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -605,10 +605,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 { - binary, err := exec.LookPath(machine.ForwarderBinaryName) - if err != nil { + // 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 { return err } + // Listen on all at port 7777 for setting up and tearing // down forwarding listenSocket := "tcp://0.0.0.0:7777" -- cgit v1.2.3-54-g00ecf