mirror/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2026-07-13 00:31:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

machine/wsl: drop cgroup_manager cgroupfs

Browse Source 
I think this should work fine with the defaults. Since we mount the
/etc/containers dir always we should no longer write to /etc/containers.
If we still need this it should be moved into the image and not done at
init time.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
(cherry picked from commit 81fd1e6e85)
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2026-06-23 13:05:15 +02:00
parent 3d9e4168f3
commit e7a45fbc97
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/machine/wsl/declares.go
View File

@@ -8,12 +8,6 @@ const (
currentMachineVersion = 3
)
const containersConf = `[containers]
[engine]
cgroup_manager = "cgroupfs"
`
const appendPort = `grep -q Port\ %d /etc/ssh/sshd_config || echo Port %d >> /etc/ssh/sshd_config`
const changePort = `sed -E -i 's/^Port[[:space:]]+[0-9]+/Port %d/' /etc/ssh/sshd_config`

4
pkg/machine/wsl/machine.go
View File

@@ -167,10 +167,6 @@ func configureSystem(mc *vmconfigs.MachineConfig, dist string, ansibleConfig *vm
return err
}
if err := wslPipe(containersConf, dist, "sh", "-c", "cat > /etc/containers/containers.conf"); err != nil {
return fmt.Errorf("could not create containers.conf for guest OS: %w", err)
}
if err := setupPodmanDockerSock(dist, mc.HostUser.Rootful); err != nil {
return err
}