Skip to content

Fixed auto location of vpnkit socket #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 28, 2019
Merged

Fixed auto location of vpnkit socket #254

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion go/hyperkit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ const (
// ConsoleLog configures console to a tty and sends its contents to the logs
ConsoleLog

defaultVPNKitSock = "Library/Containers/com.docker.docker/Data/s50"
legacyVPNKitSock = "Library/Containers/com.docker.docker/Data/s50"
defaultVPNKitSock = "Library/Containers/com.docker.docker/Data/vpnkit.eth.sock"

defaultCPUs = 1
defaultMemory = 1024 // 1G
Expand Down Expand Up @@ -591,6 +592,9 @@ func checkHyperKit(hyperkit string) (string, error) {
func checkVPNKitSock(vpnkitsock string) (string, error) {
if vpnkitsock == "auto" {
vpnkitsock = filepath.Join(getHome(), defaultVPNKitSock)
if _, err := os.Stat(vpnkitsock); err != nil {
vpnkitsock = filepath.Join(getHome(), legacyVPNKitSock)
}
}
if vpnkitsock == "" {
return "", nil
Expand Down