erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-09-26 17:47:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #20825 from openshift-cherrypick-robot/cherry-pick-20798-to-v4.8

Browse source 
[v4.8] Fix wsl.conf generation when user-mode-networking is disabled
This commit is contained in:
openshift-merge-bot[bot] 2023-12-04 14:23:46 +00:00 • committed by GitHub
commit 3f3e19f9f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/machine/wsl/machine.go
View file

@ -1150,11 +1150,8 @@ func (v *MachineVM) Set(_ string, opts machine.SetOptions) ([]error, error) {
if v.isRunning() {
update = false
setErrors = append(setErrors, fmt.Errorf("user-mode networking can only be changed when the machine is not running"))
}
if update && *opts.UserModeNetworking {
} else {
dist := toDist(v.Name)
if err := changeDistUserModeNetworking(dist, v.RemoteUsername, v.ImagePath, *opts.UserModeNetworking); err != nil {
update = false
setErrors = append(setErrors, err)

6
pkg/machine/wsl/usermodenet.go
View file

@ -4,6 +4,7 @@
package wsl
import (
"errors"
"fmt"
"os"
"os/exec"
@ -320,7 +321,10 @@ func (v *MachineVM) obtainUserModeNetLock() (*fileLock, error) {
func changeDistUserModeNetworking(dist string, user string, image string, enable bool) error {
// Only install if user-mode is being enabled and there was an image path passed
if enable && len(image) > 0 {
if enable {
if len(image) <= 0 {
return errors.New("existing machine configuration is corrupt, no image is defined")
}
if err := installUserModeDist(dist, image); err != nil {
return err
}