fix gvproxy path search for macos

macos does not have /usr/libexec/ so we look in the executable paths first. Fixes: containers#11226 [NO TESTS NEEDED] Signed-off-by: Brent Baude <[email protected]>
simnalamburt · Sep 4, 2021 · 38dcd6e · 38dcd6e
1 parent bbd03df
commit 38dcd6e
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
@@ -622,10 +622,15 @@ 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 {
-		return err
+	// MacOS does not have /usr/libexec so we look in the executable
+	// paths.
+	binary, err := exec.LookPath(machine.ForwarderBinaryName)
+	if errors.Cause(err) == exec.ErrNotFound {
+		// Nothing was found, so now check /usr/libexec, else error out
+		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