diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-21 09:57:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-21 09:57:26 -0500 |
| commit | 6e171585027e5dfcf519cf4bdc9a281248cfe0c3 (patch) | |
| tree | 4ee46dc4ce4029329629c6015700aa8cf1a62b02 /pkg/machine | |
| parent | 02d8520869a1ec23e1a7bc77cc8b90e3bca2cc03 (diff) | |
| parent | ee039b7403b55b1d4f85b5527a8caee09fa30844 (diff) | |
| download | podman-6e171585027e5dfcf519cf4bdc9a281248cfe0c3.tar.gz podman-6e171585027e5dfcf519cf4bdc9a281248cfe0c3.tar.bz2 podman-6e171585027e5dfcf519cf4bdc9a281248cfe0c3.zip | |
Merge pull request #12948 from Luap99/rootless-networking
Remove rootless_networking option from containers.conf
Diffstat (limited to 'pkg/machine')
| -rw-r--r-- | pkg/machine/ignition.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/pkg/machine/ignition.go b/pkg/machine/ignition.go index 09228553c..ca6abd48c 100644 --- a/pkg/machine/ignition.go +++ b/pkg/machine/ignition.go @@ -243,7 +243,6 @@ ExecStart=/usr/bin/sleep infinity ` containers := `[containers] netns="bridge" -rootless_networking="cni" ` rootContainers := `[engine] machine_enabled=true |