Merge pull request #20240 from n1hility/fix-wsl-version-detection

Fix locale issues with WSL version detection
containers · Oct 3, 2023 · 2457c25 · 2457c25
2 parents fdf3e4b + cbca395
commit 2457c25
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/pkg/machine/wsl/wutil/wutil.go b/pkg/machine/wsl/wutil/wutil.go
@@ -50,20 +50,13 @@ func IsWSLInstalled() bool {
 
 func IsWSLStoreVersionInstalled() bool {
 	cmd := SilentExecCmd("wsl", "--version")
-	out, err := cmd.StdoutPipe()
+	cmd.Stdout = nil
 	cmd.Stderr = nil
-	if err != nil {
-		return false
-	}
-	if err = cmd.Start(); err != nil {
-		return false
-	}
-	hasVersion := matchOutputLine(out, "WSL version:")
-	if err := cmd.Wait(); err != nil {
+	if err := cmd.Run(); err != nil {
 		return false
 	}
 
-	return hasVersion
+	return true
 }
 
 func matchOutputLine(output io.ReadCloser, match string) bool {