diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-05 18:59:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-05 18:59:55 +0100 |
commit | e826158b4b9c4baef41ca872dea5e68e089355d3 (patch) | |
tree | 3fff45f85073bfda41adccf6e45a0ffd5fc44b91 /docs/source | |
parent | 9b3b44903d4d494186bd767d2ea5f3b2c753a7f2 (diff) | |
parent | 7f433df7e76716f801c959cad82f4add397d925a (diff) | |
download | podman-e826158b4b9c4baef41ca872dea5e68e089355d3.tar.gz podman-e826158b4b9c4baef41ca872dea5e68e089355d3.tar.bz2 podman-e826158b4b9c4baef41ca872dea5e68e089355d3.zip |
Merge pull request #12183 from Luap99/rootless-netns-cleanup
Fix rootless cni netns cleanup logic and rename to rootless netns
Diffstat (limited to 'docs/source')
-rw-r--r-- | docs/source/markdown/podman-unshare.1.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/source/markdown/podman-unshare.1.md b/docs/source/markdown/podman-unshare.1.md index 72821b6e5..fa5259ae1 100644 --- a/docs/source/markdown/podman-unshare.1.md +++ b/docs/source/markdown/podman-unshare.1.md @@ -30,10 +30,10 @@ The unshare session defines two environment variables: Print usage statement -#### **--rootless-cni** +#### **--rootless-netns** -Join the rootless network namespace used for CNI networking. It can be used to -connect to a rootless container via IP address (CNI networking). This is otherwise +Join the rootless network namespace used for CNI and netavark networking. It can be used to +connect to a rootless container via IP address (bridge networking). This is otherwise not possible from the host network namespace. _Note: Using this option with more than one unshare session can have unexpected results._ @@ -78,7 +78,7 @@ $ podman unshare cat /proc/self/uid_map /proc/self/gid_map 0 1000 1 1 10000 65536 -$ podman unshare --rootless-cni ip addr +$ podman unshare --rootless-netns ip addr 1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN group default qlen 1000 link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 inet 127.0.0.1/8 scope host lo |