|
 |
049c96 |
From 2e254c04052152cb014d83ce9175f31916da07f2 Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
049c96 |
Date: Wed, 20 Jul 2016 22:55:49 +0200
|
|
|
049c96 |
Subject: [PATCH] ip-link.8: Extend type list in synopsis
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1269528
|
|
|
049c96 |
Upstream Status: iproute2.git commit 657426c5060ac
|
|
|
049c96 |
Conflicts: Patch adjusted to missing HSR, lowpan and VRF support.
|
|
|
049c96 |
|
|
|
049c96 |
commit 657426c5060ace22197397fbcaa6ac2c60d2ebec
|
|
|
049c96 |
Author: Phil Sutter <phil@nwl.cc>
|
|
|
049c96 |
Date: Sat Jul 9 11:22:47 2016 +0200
|
|
|
049c96 |
|
|
|
049c96 |
ip-link.8: Extend type list in synopsis
|
|
|
049c96 |
|
|
|
049c96 |
'ip link set' supports passing a type to set type-specific parameters.
|
|
|
049c96 |
Add this missing piece of information to the synopsis section.
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
049c96 |
---
|
|
|
049c96 |
man/man8/ip-link.8.in | 65 +++++++++++++++++++++++++++++----------------------
|
|
|
049c96 |
1 file changed, 37 insertions(+), 28 deletions(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
|
|
|
049c96 |
index ca0d955..7bf3d47 100644
|
|
|
049c96 |
--- a/man/man8/ip-link.8.in
|
|
|
049c96 |
+++ b/man/man8/ip-link.8.in
|
|
|
049c96 |
@@ -38,32 +38,6 @@ ip-link \- network device configuration
|
|
|
049c96 |
.RI "[ " ARGS " ]"
|
|
|
049c96 |
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
-.IR TYPE " := [ "
|
|
|
049c96 |
-.BR bridge " | "
|
|
|
049c96 |
-.BR bond " | "
|
|
|
049c96 |
-.BR can " | "
|
|
|
049c96 |
-.BR dummy " | "
|
|
|
049c96 |
-.BR ifb " | "
|
|
|
049c96 |
-.BR ipoib " |"
|
|
|
049c96 |
-.BR macvlan " | "
|
|
|
049c96 |
-.BR macvtap " | "
|
|
|
049c96 |
-.BR vcan " | "
|
|
|
049c96 |
-.BR veth " | "
|
|
|
049c96 |
-.BR vlan " | "
|
|
|
049c96 |
-.BR vxlan " |"
|
|
|
049c96 |
-.BR ip6tnl " |"
|
|
|
049c96 |
-.BR ipip " |"
|
|
|
049c96 |
-.BR sit " |"
|
|
|
049c96 |
-.BR gre " |"
|
|
|
049c96 |
-.BR gretap " |"
|
|
|
049c96 |
-.BR ip6gre " |"
|
|
|
049c96 |
-.BR ip6gretap " |"
|
|
|
049c96 |
-.BR vti " |"
|
|
|
049c96 |
-.BR nlmon " |"
|
|
|
049c96 |
-.BR ipvlan " |"
|
|
|
049c96 |
-.BR geneve " ]"
|
|
|
049c96 |
-
|
|
|
049c96 |
-.ti -8
|
|
|
049c96 |
.BR "ip link delete " {
|
|
|
049c96 |
.IR DEVICE " | "
|
|
|
049c96 |
.BI "group " GROUP
|
|
|
049c96 |
@@ -75,7 +49,12 @@ ip-link \- network device configuration
|
|
|
049c96 |
.BR "ip link set " {
|
|
|
049c96 |
.IR DEVICE " | "
|
|
|
049c96 |
.BI "group " GROUP
|
|
|
049c96 |
-.RB "} [ { " up " | " down " } ]"
|
|
|
049c96 |
+}
|
|
|
049c96 |
+.br
|
|
|
049c96 |
+.RB "[ { " up " | " down " } ]"
|
|
|
049c96 |
+.br
|
|
|
049c96 |
+.RB "[ " type
|
|
|
049c96 |
+.IR "ETYPE TYPE_ARGS" " ]"
|
|
|
049c96 |
.br
|
|
|
049c96 |
.RB "[ " arp " { " on " | " off " } ]"
|
|
|
049c96 |
.br
|
|
|
049c96 |
@@ -151,12 +130,42 @@ ip-link \- network device configuration
|
|
|
049c96 |
.B master
|
|
|
049c96 |
.IR DEVICE " ] ["
|
|
|
049c96 |
.B type
|
|
|
049c96 |
-.IR TYPE " ]"
|
|
|
049c96 |
+.IR ETYPE " ]"
|
|
|
049c96 |
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
.B ip link help
|
|
|
049c96 |
.RI "[ " TYPE " ]"
|
|
|
049c96 |
|
|
|
049c96 |
+.ti -8
|
|
|
049c96 |
+.IR TYPE " := [ "
|
|
|
049c96 |
+.BR bridge " | "
|
|
|
049c96 |
+.BR bond " | "
|
|
|
049c96 |
+.BR can " | "
|
|
|
049c96 |
+.BR dummy " | "
|
|
|
049c96 |
+.BR ifb " | "
|
|
|
049c96 |
+.BR ipoib " |"
|
|
|
049c96 |
+.BR macvlan " | "
|
|
|
049c96 |
+.BR macvtap " | "
|
|
|
049c96 |
+.BR vcan " | "
|
|
|
049c96 |
+.BR veth " | "
|
|
|
049c96 |
+.BR vlan " | "
|
|
|
049c96 |
+.BR vxlan " |"
|
|
|
049c96 |
+.BR ip6tnl " |"
|
|
|
049c96 |
+.BR ipip " |"
|
|
|
049c96 |
+.BR sit " |"
|
|
|
049c96 |
+.BR gre " |"
|
|
|
049c96 |
+.BR gretap " |"
|
|
|
049c96 |
+.BR ip6gre " |"
|
|
|
049c96 |
+.BR ip6gretap " |"
|
|
|
049c96 |
+.BR vti " |"
|
|
|
049c96 |
+.BR nlmon " |"
|
|
|
049c96 |
+.BR ipvlan " |"
|
|
|
049c96 |
+.BR geneve " ]"
|
|
|
049c96 |
+
|
|
|
049c96 |
+.ti -8
|
|
|
049c96 |
+.IR ETYPE " := [ " TYPE " |"
|
|
|
049c96 |
+.BR bridge_slave " | " bond_slave " ]"
|
|
|
049c96 |
+
|
|
|
049c96 |
.SH "DESCRIPTION"
|
|
|
049c96 |
.SS ip link add - add virtual link
|
|
|
049c96 |
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|