iplink: fix help of 'netns' arg

'ip link set foo netns /proc/1/ns/net' is a valid command.
Let's update the doc accordingly.

Fixes: 0dc34c7713bb ("iproute2: Add processless network namespace support")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/ip/iplink.c b/ip/iplink.c
index 0aaca35056cd729543151f1a1982f094d3870a53..690636b65190daa7f9c8d8ebf9337aa48f1dd1c7 100644 (file)
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -63,7 +63,7 @@ void iplink_usage(void)
                        "                   [ mtu MTU ] [index IDX ]\n"
                        "                   [ numtxqueues QUEUE_COUNT ]\n"
                        "                   [ numrxqueues QUEUE_COUNT ]\n"
-                       "                   [ netns { PID | NETNSNAME } ]\n"
+                       "                   [ netns { PID | NETNSNAME | NETNSFILE } ]\n"
                        "                   type TYPE [ ARGS ]\n"
                        "\n"
                        "       ip link delete { DEVICE | dev DEVICE | group DEVGROUP } type TYPE [ ARGS ]\n"
@@ -88,7 +88,7 @@ void iplink_usage(void)
                "               [ address LLADDR ]\n"
                "               [ broadcast LLADDR ]\n"
                "               [ mtu MTU ]\n"
-               "               [ netns { PID | NETNSNAME } ]\n"
+               "               [ netns { PID | NETNSNAME | NETNSFILE } ]\n"
                "               [ link-netns NAME | link-netnsid ID ]\n"
                "               [ alias NAME ]\n"
                "               [ vf NUM [ mac LLADDR ]\n"

diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
index a4e0c4030363e775d83840a436ac89d0451f8584..e23474b3589cfddf03c9ab8426e31634056cadb6 100644 (file)
--- a/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@ -49,7 +49,7 @@ ip-link \- network device configuration
 .IR BYTES " ]"
 .br
 .RB "[ " netns " {"
-.IR PID " | " NETNSNAME " } ]"
+.IR PID " | " NETNSNAME " | " NETNSFILE " } ]"
 .br
 .BI type " TYPE"
 .RI "[ " ARGS " ]"
@@ -118,7 +118,7 @@ ip-link \- network device configuration
 .IR MTU " ]"
 .br
 .RB "[ " netns " {"
-.IR PID " | " NETNSNAME " } ]"
+.IR PID " | " NETNSNAME " | " NETNSFILE " } ]"
 .br
 .RB "[ " link-netnsid
 .IR ID " ]"
@@ -465,8 +465,15 @@ specifies the desired index of the new virtual device. The link
 creation fails, if the index is busy.
 
 .TP
-.BI netns " { PID | NETNSNAME } "
-specifies the desired network namespace to create interface in.
+.B netns
+.RI "{ " PID " | " NETNSNAME " | " NETNSFILE " }"
+.br
+create the device in the network namespace associated with process
+.IR "PID " or
+the name
+.IR "NETNSNAME " or
+the file
+.IR "NETNSFILE".
 
 .TP
 VLAN Type Support
@@ -2188,10 +2195,15 @@ the interface is
 .IR "POINTOPOINT" .
 
 .TP
-.BI netns " NETNSNAME " \fR| " PID"
-move the device to the network namespace associated with name
+.B netns
+.RI "{ " PID " | " NETNSNAME " | " NETNSFILE " }"
+.br
+move the device to the network namespace associated with process
+.IR "PID " or
+the name
 .IR "NETNSNAME " or
-.RI process " PID".
+the file
+.IR "NETNSFILE".
 
 Some devices are not allowed to change network namespace: loopback, bridge,
 wireless. These are network namespace local devices. In such case