Merge pull request #21264 from cfergeau/applehv

applehv: return socket path from setupAPIForwarding
containers · Jan 18, 2024 · 597ff52 · 597ff52 · packit-as-a-service · Jan 18, 2024
2 parents d38ee13 + 3fef531
commit 597ff52
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/pkg/machine/applehv/machine.go b/pkg/machine/applehv/machine.go
@@ -572,12 +572,6 @@ func (m *MacMachine) Start(name string, opts machine.StartOptions) error {
 		return machine.ErrVMAlreadyRunning
 	}
 
-	ioEater, err := os.OpenFile(os.DevNull, os.O_WRONLY, 0755)
-	if err != nil {
-		return err
-	}
-	defer ioEater.Close()
-
 	// TODO handle returns from startHostNetworking
 	forwardSock, forwardState, err := m.startHostNetworking()
 	if err != nil {
@@ -641,8 +635,6 @@ func (m *MacMachine) Start(name string, opts machine.StartOptions) error {
 		cmd.Args = append(cmd.Args, "--gui") // add command line switch to pop the gui open
 	}
 
-	cmd.ExtraFiles = []*os.File{ioEater, ioEater, ioEater}
-
 	readSocketBaseDir := filepath.Dir(m.ReadySocket.GetPath())
 	if err := os.MkdirAll(readSocketBaseDir, 0755); err != nil {
 		return err
@@ -1039,7 +1031,8 @@ func (m *MacMachine) setupAPIForwarding(cmd gvproxy.GvproxyCommand) (gvproxy.Gvp
 		}
 	}
 
-	return cmd, "", machine.MachineLocal
+	return cmd, socket.GetPath(), machine.MachineLocal
+
 }
 
 func (m *MacMachine) dockerSock() (string, error) {