opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 09:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add new windows installer and build

Browse Source 
Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
This commit is contained in:
Jason T. Greene
2022-08-30 23:23:14 -05:00
parent f4c39df25e
commit ecb9f99b88
29 changed files with 1334 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/machine/wsl/machine.go
View File

@ -638,13 +638,13 @@ func installScripts(dist string) error {
}
func checkAndInstallWSL(opts machine.InitOptions) (bool, error) {
if isWSLInstalled() {
if IsWSLInstalled() {
return true, nil
}
admin := hasAdminRights()
if !isWSLFeatureEnabled() {
if !IsWSLFeatureEnabled() {
return false, attemptFeatureInstall(opts, admin)
}
@ -1105,9 +1105,10 @@ func waitPipeExists(pipeName string, retries int, checkFailure func() error) err
return err
}
func isWSLInstalled() bool {
cmd := exec.Command("wsl", "--status")
func IsWSLInstalled() bool {
cmd := SilentExecCmd("wsl", "--status")
out, err := cmd.StdoutPipe()
cmd.Stderr = nil
if err != nil {
return false
}
@ -1131,9 +1132,8 @@ func isWSLInstalled() bool {
return true
}
func isWSLFeatureEnabled() bool {
cmd := exec.Command("wsl", "--set-default-version", "2")
return cmd.Run() == nil
func IsWSLFeatureEnabled() bool {
return SilentExec("wsl", "--set-default-version", "2") == nil
}
func isWSLRunning(dist string) (bool, error) {