Merge pull request #10711 from spowelljr/fixWSLDetection

medyagh · web-flow · commit 9aee24b86106 · 2021-03-04T10:06:24.000-08:00
Remove WSLENV empty check from IsMicrosoftWSL
diff --git a/pkg/minikube/driver/driver.go b/pkg/minikube/driver/driver.go
@@ -174,7 +174,7 @@ func NeedsPortForward(name string) bool {
 // checking for WSL env var based on this https://github.com/microsoft/WSL/issues/423#issuecomment-608237689
 // also based on https://github.com/microsoft/vscode/blob/90a39ba0d49d75e9a4d7e62a6121ad946ecebc58/resources/win32/bin/code.sh#L24
 func IsMicrosoftWSL() bool {
-	return os.Getenv("WSL_DISTRO_NAME") != "" || os.Getenv("WSLPATH") != "" || os.Getenv("WSLENV") != ""
+	return os.Getenv("WSL_DISTRO_NAME") != "" || os.Getenv("WSLPATH") != ""
 }
 
 // HasResourceLimits returns true if driver can set resource limits such as memory size or CPU count.

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ func NeedsPortForward(name string) bool {`
`174`	`174`	`// checking for WSL env var based on this https://github.com/microsoft/WSL/issues/423#issuecomment-608237689`
`175`	`175`	`// also based on https://github.com/microsoft/vscode/blob/90a39ba0d49d75e9a4d7e62a6121ad946ecebc58/resources/win32/bin/code.sh#L24`
`176`	`176`	`func IsMicrosoftWSL() bool {`
`177`		`- return os.Getenv("WSL_DISTRO_NAME") != "" \|\| os.Getenv("WSLPATH") != "" \|\| os.Getenv("WSLENV") != ""`
	`177`	`+ return os.Getenv("WSL_DISTRO_NAME") != "" \|\| os.Getenv("WSLPATH") != ""`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`// HasResourceLimits returns true if driver can set resource limits such as memory size or CPU count.`