mirror of
https://github.com/containers/podman.git
synced 2026-03-13 08:01:19 +08:00
Merge pull request #15184 from gbraad/change-config-order
Fixes #15154 Change order when config and connections are written
This commit is contained in:
@@ -364,14 +364,6 @@ func (v *MachineVM) Init(opts machine.InitOptions) (bool, error) {
|
||||
return false, err
|
||||
}
|
||||
|
||||
if err := v.writeConfig(); err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
if err := setupConnections(v, opts, sshDir); err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
dist, err := provisionWSLDist(v)
|
||||
if err != nil {
|
||||
return false, err
|
||||
@@ -393,6 +385,14 @@ func (v *MachineVM) Init(opts machine.InitOptions) (bool, error) {
|
||||
// Cycle so that user change goes into effect
|
||||
_ = terminateDist(dist)
|
||||
|
||||
if err := v.writeConfig(); err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
if err := setupConnections(v, opts, sshDir); err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
return true, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user