opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-11-29 17:48:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27470 from baude/wslfixexit

Browse Source 
Fix WSL machine start with --update-connection
This commit is contained in:
openshift-merge-bot[bot]
2025-11-10 13:14:20 +00:00
committed by GitHub
parent 06b0711252 e059055aa5
commit 31b1ed8ed0
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/machine/shim/host.go
View File

@@ -664,9 +664,21 @@ func Start(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, opts machine.St
}
}
// embedded function for handling if we should update the default connection
// and the actual update
updateConnectionFunc := func() error {
if !updateDefaultConnection {
return nil
}
return config.EditConnectionConfig(func(cfg *config.ConnectionsFile) error {
logrus.Infof("Setting default Podman connection to %s", connName)
cfg.Connection.Default = connName
return nil
})
}
// Provider is responsible for waiting
if mp.UseProviderNetworkSetup() {
return nil
return updateConnectionFunc()
}
noInfo := opts.NoInfo
@@ -679,17 +691,7 @@ func Start(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, opts machine.St
noInfo,
mc.HostUser.Rootful,
)
// return if we dont need to set the machine to the default connection
// or it was determined to already be the default earlier
if !updateDefaultConnection {
return nil
}
return config.EditConnectionConfig(func(cfg *config.ConnectionsFile) error {
logrus.Infof("Setting default Podman connection to %s", connName)
cfg.Connection.Default = connName
return nil
})
return updateConnectionFunc()
}
func Set(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, opts machineDefine.SetOptions) error {