summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorPaul Holzinger <pholzing@redhat.com>2022-04-20 13:21:56 +0200
committerPaul Holzinger <pholzing@redhat.com>2022-04-20 13:59:01 +0200
commit80d175279167b45ad1c90354996abec4a58c42ad (patch)
tree41ddc41e0a3e4fdb77058b20032bf612dcb609fc /libpod
parentbc8d8737b760a1f42a9208c6067d2e163817d5f0 (diff)
downloadpodman-80d175279167b45ad1c90354996abec4a58c42ad.tar.gz
podman-80d175279167b45ad1c90354996abec4a58c42ad.tar.bz2
podman-80d175279167b45ad1c90354996abec4a58c42ad.zip
slirp4netns: actually make ipv6 default
We already have ipv6 enabled as default via the containers.conf setting. However the documentation did not reflect this. Also if no options were set in contianers.conf it would have ipv6 disabled. We can now remove the extra option from containers.conf. Also fix another outdated option description for host.containers.internal and add that the options can also be set in contianers.conf. [NO NEW TESTS NEEDED] Fixes #13914 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/networking_slirp4netns.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/libpod/networking_slirp4netns.go b/libpod/networking_slirp4netns.go
index 3f2842d4c..4a0ef0b3a 100644
--- a/libpod/networking_slirp4netns.go
+++ b/libpod/networking_slirp4netns.go
@@ -88,6 +88,7 @@ func parseSlirp4netnsNetworkOptions(r *Runtime, extraOptions []string) (*slirp4n
disableHostLoopback: true,
mtu: slirp4netnsMTU,
noPivotRoot: r.config.Engine.NoPivotRoot,
+ enableIPv6: true,
}
for _, o := range slirpOptions {
parts := strings.SplitN(o, "=", 2)