summaryrefslogtreecommitdiff
path: root/pkg/machine
diff options
context:
space:
mode:
authorBrent Baude <bbaude@redhat.com>2021-08-11 14:35:03 -0500
committerBrent Baude <bbaude@redhat.com>2021-08-12 09:11:09 -0500
commit9fc9465630123b150d69fb85dcc83805f955cb49 (patch)
tree7629998e3930adaa3f63384b8dd93b61ebc9ec5b /pkg/machine
parent643178c1ec03df481d9e38b84f36f9bd48550ec4 (diff)
downloadpodman-9fc9465630123b150d69fb85dcc83805f955cb49.tar.gz
podman-9fc9465630123b150d69fb85dcc83805f955cb49.tar.bz2
podman-9fc9465630123b150d69fb85dcc83805f955cb49.zip
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 <bbaude@redhat.com>
Diffstat (limited to 'pkg/machine')
-rw-r--r--pkg/machine/qemu/machine.go6
1 files changed, 4 insertions, 2 deletions
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"