| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20230719185106.17614-22-gioele@svario.it> Date: Wed, 19 Jul 2023 20:51:05 +0200 From: Gioele Barabucci <gioele@...rio.it> To: netdev@...r.kernel.org Cc: Stephen Hemminger <stephen@...workplumber.org>, Gioele Barabucci <gioele@...rio.it> Subject: [iproute2 21/22] man: Document lookup of configuration files in /etc and /usr Signed-off-by: Gioele Barabucci <gioele@...rio.it> --- man/man8/Makefile | 1 + man/man8/ip-address.8.in | 5 +++-- man/man8/ip-link.8.in | 10 ++++++---- man/man8/ip-route.8.in | 43 ++++++++++++++++++++++++---------------- 4 files changed, 36 insertions(+), 23 deletions(-) diff --git a/man/man8/Makefile b/man/man8/Makefile index ae5e37a5..6dab182f 100644 --- a/man/man8/Makefile +++ b/man/man8/Makefile @@ -10,6 +10,7 @@ all: $(TARGETS) -e "s|@...NS_ETC_DIR@|$(NETNS_ETC_DIR)|g" \ -e "s|@...NS_RUN_DIR@|$(NETNS_RUN_DIR)|g" \ -e "s|@...CONF_ETC_DIR@|$(CONF_ETC_DIR)|g" \ + -e "s|@...CONF_USR_DIR@|$(CONF_USR_DIR)|g" \ $< > $@ distclean: clean diff --git a/man/man8/ip-address.8.in b/man/man8/ip-address.8.in index a2df22d4..b9a476a5 100644 --- a/man/man8/ip-address.8.in +++ b/man/man8/ip-address.8.in @@ -208,8 +208,9 @@ The maximum allowed total length of label is 15 characters. .TP .BI scope " SCOPE_VALUE" the scope of the area where this address is valid. -The available scopes are listed in file -.BR "@SYSCONF_ETC_DIR@..._scopes" . +The available scopes are listed in +.BR "@SYSCONF_USR_DIR@..._scopes" or +.BR "@SYSCONF_ETC_DIR@..._scopes" (has precedence if exists). Predefined scope values are: .in +8 diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in index ac1a3b5f..8f07de9a 100644 --- a/man/man8/ip-link.8.in +++ b/man/man8/ip-link.8.in @@ -2250,8 +2250,9 @@ give the device a symbolic name for easy reference. .TP .BI group " GROUP" specify the group the device belongs to. -The available groups are listed in file -.BR "@SYSCONF_ETC_DIR@...oup" . +The available groups are listed in +.BR "@SYSCONF_USR_DIR@...oup" or +.BR "@SYSCONF_ETC_DIR@...oup" (has precedence if exists). .TP .BI vf " NUM" @@ -2851,9 +2852,10 @@ specifies which help of link type to display. .SS .I GROUP -may be a number or a string from the file +may be a number or a string from +.B @SYSCONF_USR_DIR@...oup or .B @SYSCONF_ETC_DIR@...oup -which can be manually filled. +which can be manually filled and has precedence if exists. .SH "EXAMPLES" .PP diff --git a/man/man8/ip-route.8.in b/man/man8/ip-route.8.in index 9fc3f4a1..76151689 100644 --- a/man/man8/ip-route.8.in +++ b/man/man8/ip-route.8.in @@ -356,8 +356,9 @@ normal routing tables. .P .B Route tables: Linux-2.x can pack routes into several routing tables identified -by a number in the range from 1 to 2^32-1 or by name from the file -.B @SYSCONF_ETC_DIR@..._tables +by a number in the range from 1 to 2^32-1 or by name from +.B @SYSCONF_USR_DIR@..._tables or +.B @SYSCONF_ETC_DIR@..._tables (has precedence if exists). By default all normal routes are inserted into the .B main table (ID 254) and the kernel only uses this table when calculating routes. @@ -420,7 +421,8 @@ may still match a route with a zero TOS. .I TOS is either an 8 bit hexadecimal number or an identifier from -.BR "@SYSCONF_ETC_DIR@..._dsfield" . +.BR "@SYSCONF_USR_DIR@..._dsfield" or +.BR "@SYSCONF_ETC_DIR@..._dsfield" (has precedence if exists). .TP .BI metric " NUMBER" @@ -434,8 +436,9 @@ is an arbitrary 32bit number, where routes with lower values are preferred. .BI table " TABLEID" the table to add this route to. .I TABLEID -may be a number or a string from the file -.BR "@SYSCONF_ETC_DIR@..._tables" . +may be a number or a string from +.BR "@SYSCONF_USR_DIR@..._tables" or +.BR "@SYSCONF_ETC_DIR@..._tables" (has precedence if exists). If this parameter is omitted, .B ip assumes the @@ -475,8 +478,9 @@ covered by the route prefix. .BI realm " REALMID" the realm to which this route is assigned. .I REALMID -may be a number or a string from the file -.BR "@SYSCONF_ETC_DIR@..._realms" . +may be a number or a string from +.BR "@SYSCONF_USR_DIR@..._realms" or +.BR "@SYSCONF_ETC_DIR@..._realms" (has precedence if exists). .TP .BI mtu " MTU" @@ -626,8 +630,9 @@ command. .BI scope " SCOPE_VAL" the scope of the destinations covered by the route prefix. .I SCOPE_VAL -may be a number or a string from the file -.BR "@SYSCONF_ETC_DIR@..._scopes" . +may be a number or a string from +.BR "@SYSCONF_USR_DIR@..._scopes" or +.BR "@SYSCONF_ETC_DIR@..._scopes" (has precedence if exists). If this parameter is omitted, .B ip assumes scope @@ -646,8 +651,9 @@ routes. .BI protocol " RTPROTO" the routing protocol identifier of this route. .I RTPROTO -may be a number or a string from the file -.BR "@SYSCONF_ETC_DIR@..._protos" . +may be a number or a string from +.BR "@SYSCONF_ETC_DIR@..._protos" or +.BR "@SYSCONF_ETC_DIR@..._protos" (has precedence if exists). If the routing protocol ID is not given, .B ip assumes protocol .B boot @@ -879,8 +885,9 @@ matching packets are dropped. - Decapsulate the inner IPv6 packet and forward it according to the specified lookup table. .I TABLEID -is either a number or a string from the file -.BR "@SYSCONF_ETC_DIR@..._tables" . +is either a number or a string from +.BR "@SYSCONF_USR_DIR@..._tables" or +.BR "@SYSCONF_ETC_DIR@..._tables" (has precedence if exists). If .B vrftable is used, the argument must be a VRF device associated with @@ -895,8 +902,9 @@ and an inner IPv6 packet. Other matching packets are dropped. - Decapsulate the inner IPv4 packet and forward it according to the specified lookup table. .I TABLEID -is either a number or a string from the file -.BR "@SYSCONF_ETC_DIR@..._tables" . +is either a number or a string from +.BR "@SYSCONF_USR_DIR@..._tables" or +.BR "@SYSCONF_ETC_DIR@..._tables" (has precedence if exists). The argument must be a VRF device associated with the table id. Moreover, the VRF table associated with the table id must be configured with the VRF strict mode turned on (net.vrf.strict_mode=1). This action @@ -908,8 +916,9 @@ at all, and an inner IPv4 packet. Other matching packets are dropped. - Decapsulate the inner IPv4 or IPv6 packet and forward it according to the specified lookup table. .I TABLEID -is either a number or a string from the file -.BR "@SYSCONF_ETC_DIR@..._tables" . +is either a number or a string from +.BR "@SYSCONF_USR_DIR@..._tables" or +.BR "@SYSCONF_ETC_DIR@..._tables" (has precedence if exists). The argument must be a VRF device associated with the table id. Moreover, the VRF table associated with the table id must be configured with the VRF strict mode turned on (net.vrf.strict_mode=1). This action -- 2.39.2
Powered by blists - more mailing lists