mirror of
https://github.com/containers/podman.git
synced 2025-11-29 17:48:05 +08:00
Fix WSL machine start with --update-connection
In my previous PR, #27405, the optional WSL tests do not pass because of an early return consistent with WSL's networking. This PR corrects the problem. Fixes: #27469 Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
@@ -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
|
// Provider is responsible for waiting
|
||||||
if mp.UseProviderNetworkSetup() {
|
if mp.UseProviderNetworkSetup() {
|
||||||
return nil
|
return updateConnectionFunc()
|
||||||
}
|
}
|
||||||
|
|
||||||
noInfo := opts.NoInfo
|
noInfo := opts.NoInfo
|
||||||
@@ -679,17 +691,7 @@ func Start(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, opts machine.St
|
|||||||
noInfo,
|
noInfo,
|
||||||
mc.HostUser.Rootful,
|
mc.HostUser.Rootful,
|
||||||
)
|
)
|
||||||
|
return updateConnectionFunc()
|
||||||
// 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
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func Set(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, opts machineDefine.SetOptions) error {
|
func Set(mc *vmconfigs.MachineConfig, mp vmconfigs.VMProvider, opts machineDefine.SetOptions) error {
|
||||||
|
|||||||
Reference in New Issue
Block a user