From f73cac8d3d94fbb4e507059a6ebe369e9aaa49b8 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 10 Apr 2007 19:00:08 +0000 Subject: [PATCH] - forgot this hunk that corrects the usage text of ip --- include/usage.h | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/include/usage.h b/include/usage.h index 048dcbdde..d196afcbf 100644 --- a/include/usage.h +++ b/include/usage.h @@ -1579,12 +1579,24 @@ USE_SELINUX( \ "\n -Z Set security context of copy" \ ) - +/* would need to make the " | " optional depending on more than one selected */ #define ip_trivial_usage \ - "[OPTIONS] {address | link | route | tunnel | rule} {COMMAND}" + "[OPTIONS] {" \ + USE_FEATURE_IP_ADDRESS("address | ") \ + USE_FEATURE_IP_ROUTE("route | ") \ + USE_FEATURE_IP_LINK("link | ") \ + USE_FEATURE_IP_TUNNEL("tunnel | ") \ + USE_FEATURE_IP_RULE("rule") \ + "} {COMMAND}" #define ip_full_usage \ "ip [OPTIONS] OBJECT {COMMAND}\n" \ - "where OBJECT := {link | addr | route | tunnel |rule}\n" \ + "where OBJECT := {" \ + USE_FEATURE_IP_ADDRESS("address | ") \ + USE_FEATURE_IP_ROUTE("route | ") \ + USE_FEATURE_IP_LINK("link | ") \ + USE_FEATURE_IP_TUNNEL("tunnel | ") \ + USE_FEATURE_IP_RULE("rule") \ + "}\n" \ "OPTIONS := { -f[amily] { inet | inet6 | link } | -o[neline] }" #define ipaddr_trivial_usage \