diff options
author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2021-08-12 15:39:51 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-12 15:39:51 +0000 |
commit | 94886d4abad7787cb920614ed26955ca36b13846 (patch) | |
tree | b9c138314bb2ae64aa25b82a8b51db100a206e55 /pkg/machine | |
parent | de043a5a029d4d03b91f8b88ca8cee7d71dcdeed (diff) | |
parent | 9fc9465630123b150d69fb85dcc83805f955cb49 (diff) | |
download | podman-94886d4abad7787cb920614ed26955ca36b13846.tar.gz podman-94886d4abad7787cb920614ed26955ca36b13846.tar.bz2 podman-94886d4abad7787cb920614ed26955ca36b13846.zip |
Merge pull request #11206 from baude/gvproxynewpath
Set gvproxy path to /usr/libexec/podman/gvproxy
Diffstat (limited to 'pkg/machine')
-rw-r--r-- | pkg/machine/qemu/machine.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index 7b1ebcb03..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 := filepath.Join("/usr/lib/podman/", machine.ForwarderBinaryName) - if _, err := os.Stat(binary); os.IsNotExist(err) { - return errors.Errorf("unable to find %s", binary) + // 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" |