diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-08-05 08:07:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-05 08:07:45 +0000 |
| commit | ff144e085e0e0b90b9bed4ce78cce014bcc672c2 (patch) | |
| tree | fe7d4b2011c681e0de16b35eec9cef021b8bdd04 /pkg | |
| parent | 253f283220bf29e97d49e2f113881e4bfce96415 (diff) | |
| parent | d4c6e056db67f58320252a381149983d28ce4454 (diff) | |
| download | podman-ff144e085e0e0b90b9bed4ce78cce014bcc672c2.tar.gz podman-ff144e085e0e0b90b9bed4ce78cce014bcc672c2.tar.bz2 podman-ff144e085e0e0b90b9bed4ce78cce014bcc672c2.zip | |
Merge pull request #15184 from gbraad/change-config-order
Fixes #15154 Change order when config and connections are written
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/machine/wsl/machine.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go index 9a57102f0..8f6ef7a43 100644 --- a/pkg/machine/wsl/machine.go +++ b/pkg/machine/wsl/machine.go @@ -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 } |