Skip to contentSkip to conversation

iplink: fix help of 'netns' arg

PATCH In review Nicolas Dichtel 2 participants 2 messages Apr 18, 2023 – Apr 19, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 ip/iplink.c           | 4 ++--
 man/man8/ip-link.8.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
ip/iplink.c +2 -2
index a8da52f9f7ca..f7db17a9869d 100644
@@ -63,7 +63,7 @@ void iplink_usage(void)
 			"		    [ mtu MTU ] [index IDX ]\n"
 			"		    [ numtxqueues QUEUE_COUNT ]\n"
 			"		    [ numrxqueues QUEUE_COUNT ]\n"
-			"		    [ netns { PID | NAME } ]\n"
+			"		    [ netns { PID | NAME | NETNS_FILE } ]\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 | NAME } ]\n"
+		"		[ netns { PID | NAME | NETNS_FILE } ]\n"
 		"		[ link-netns NAME | link-netnsid ID ]\n"
 		"		[ alias NAME ]\n"
 		"		[ vf NUM [ mac LLADDR ]\n"
man/man8/ip-link.8.in +2 -2
index c8c656579364..5b8ddbf20359 100644
@@ -49,7 +49,7 @@ ip-link \- network device configuration
 .IR BYTES " ]"
 .br
 .RB "[ " netns " {"
-.IR PID " | " NETNSNAME " } ]"
+.IR PID " | " NETNSNAME " | " NETNS_FILE " } ]"
 .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 " | " NETNS_FILE " } ]"
 .br
 .RB "[ " link-netnsid
 .IR ID " ]"
Signature · 1 line
2.39.2
#1 lore raw
Quoted 46 lines · Nicolas Dichtel

'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")
---
 ip/iplink.c           | 4 ++--
 man/man8/ip-link.8.in | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
ip/iplink.c +2 -2
index a8da52f9f7ca..f7db17a9869d 100644
@@ -63,7 +63,7 @@ void iplink_usage(void)
 			"		    [ mtu MTU ] [index IDX ]\n"
 			"		    [ numtxqueues QUEUE_COUNT ]\n"
 			"		    [ numrxqueues QUEUE_COUNT ]\n"
-			"		    [ netns { PID | NAME } ]\n"
+			"		    [ netns { PID | NAME | NETNS_FILE } ]\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 | NAME } ]\n"
+		"		[ netns { PID | NAME | NETNS_FILE } ]\n"
 		"		[ link-netns NAME | link-netnsid ID ]\n"
 		"		[ alias NAME ]\n"
 		"		[ vf NUM [ mac LLADDR ]\n"
man/man8/ip-link.8.in +1 -1
index c8c656579364..5b8ddbf20359 100644
@@ -49,7 +49,7 @@ ip-link \- network device configuration
 .IR BYTES " ]"
 .br
 .RB "[ " netns " {"
-.IR PID " | " NETNSNAME " } ]"
+.IR PID " | " NETNSNAME " | " NETNS_FILE " } ]"
 .br
 .BI type " TYPE"
 .RI "[ " ARGS " ]"

man/man8/ip-link.8.in ip-link \- network device configuration · line 124

Quoted 8 lines
man/man8/ip-link.8.in +1 -1
@@ -118,7 +118,7 @@ ip-link \- network device configuration
 .IR MTU " ]"
 .br
 .RB "[ " netns " {"
-.IR PID " | " NETNSNAME " } ]"
+.IR PID " | " NETNSNAME " | " NETNS_FILE " } ]"
 .br
 .RB "[ " link-netnsid
 .IR ID " ]"

Hi Nicolas,

I think corresponding updates are also wanted for the set and add subcommands in the DESCRIPTION section of tip-link.8.in.