Merge pull request #2933 from pcfdev-forks/master

Configure guest with 9P mount and vsock port when using existing VPNKit instance
This commit is contained in:
Justin Cormack 2018-03-01 11:22:41 +00:00 committed by GitHub
commit adebf0377c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -245,6 +245,10 @@ func runHyperKit(args []string) {
if len(netMode) > 2 {
vpnkitPortSocket = netMode[2]
}
// The guest will use this 9P mount to configure which ports to forward
h.Sockets9P = []hyperkit.Socket9P{{Path: vpnkitPortSocket, Tag: "port"}}
// VSOCK port 62373 is used to pass traffic from host->guest
h.VSockPorts = append(h.VSockPorts, 62373)
} else {
// Start new VPNKit instance
h.VPNKitSock = filepath.Join(*state, "vpnkit_eth.sock")