aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/utils
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2017-12-06 22:14:09 +0100
committerHans Dedecker <dedeckeh@gmail.com>2017-12-06 22:30:54 +0100
commit79a19e5d27db21d2fe9a5c14f8fad365fca9b831 (patch)
tree3c75877d89e78739dcbbaebf05583dd3280d26e9 /package/network/utils
parentc3c1185d56abbae471c3d0bb0477349f79f5d3bb (diff)
downloadupstream-79a19e5d27db21d2fe9a5c14f8fad365fca9b831.tar.gz
upstream-79a19e5d27db21d2fe9a5c14f8fad365fca9b831.tar.bz2
upstream-79a19e5d27db21d2fe9a5c14f8fad365fca9b831.zip
iproute2: align ip help text for tiny variant
Tiny variant supports a subset of the ip commands; align the ip help text so it actually reflects which commands are supported in the tiny variant. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'package/network/utils')
-rw-r--r--package/network/utils/iproute2/patches/300-ip_tiny.patch19
1 files changed, 18 insertions, 1 deletions
diff --git a/package/network/utils/iproute2/patches/300-ip_tiny.patch b/package/network/utils/iproute2/patches/300-ip_tiny.patch
index 813d579434..35b588f7ef 100644
--- a/package/network/utils/iproute2/patches/300-ip_tiny.patch
+++ b/package/network/utils/iproute2/patches/300-ip_tiny.patch
@@ -25,7 +25,24 @@
sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, "\1")) return \1;:;p}' $$files ; \
--- a/ip/ip.c
+++ b/ip/ip.c
-@@ -74,32 +74,44 @@ static const struct cmd {
+@@ -49,10 +49,16 @@ static void usage(void)
+ fprintf(stderr,
+ "Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
+ " ip [ -force ] -batch filename\n"
++#ifndef IPROUTE2_TINY
+ "where OBJECT := { link | address | addrlabel | route | rule | neigh | ntable |\n"
+ " tunnel | tuntap | maddress | mroute | mrule | monitor | xfrm |\n"
+ " netns | l2tp | fou | macsec | tcp_metrics | token | netconf | ila |\n"
+ " vrf | sr }\n"
++#else
++"where OBJECT := { link | address | route | rule | neigh | tunnel | maddress |\n"
++" mroute | mrule | monitor | netns | macsec | token | ila |\n"
++" vrf | sr }\n"
++#endif
+ " OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
+ " -h[uman-readable] | -iec |\n"
+ " -f[amily] { inet | inet6 | ipx | dnet | mpls | bridge | link } |\n"
+@@ -74,32 +80,44 @@ static const struct cmd {
int (*func)(int argc, char **argv);
} cmds[] = {
{ "address", do_ipaddr },