summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2016-09-25 02:05:24 +0200
committerDenys Vlasenko2016-09-25 02:05:24 +0200
commitbcf47eaa1f13dfdcc4564ddb1e5aedce4b3ca2b2 (patch)
tree60c147903ecc8b756f3e25a12417b91e97c5bc79
parent65ba7113e3da696f8e2ebf48658b1f71967d030b (diff)
downloadbusybox-bcf47eaa1f13dfdcc4564ddb1e5aedce4b3ca2b2.zip
busybox-bcf47eaa1f13dfdcc4564ddb1e5aedce4b3ca2b2.tar.gz
ifupdown: improve help text, add comment about run-parts error msg
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--networking/ifupdown.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 5c24451..b0bc0d7 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -21,7 +21,7 @@
//usage: "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
//usage:#define ifup_full_usage "\n\n"
//usage: " -a De/configure all interfaces automatically"
-//usage: "\n -i FILE Use FILE for interface definitions"
+//usage: "\n -i FILE Use FILE instead of /etc/network/interfaces"
//usage: "\n -n Print out what would happen, but don't do it"
//usage: IF_FEATURE_IFUPDOWN_MAPPING(
//usage: "\n (note: doesn't disable mappings)"
@@ -1069,6 +1069,11 @@ static int execute_all(struct interface_defn_t *ifd, const char *opt)
}
}
+ /* Tested on Debian Squeeze: "standard" ifup runs this without
+ * checking that directory exists. If it doesn't, run-parts
+ * complains, and this message _is_ annoyingly visible.
+ * Don't "fix" this (unless newer Debian does).
+ */
buf = xasprintf("run-parts /etc/network/if-%s.d", opt);
/* heh, we don't bother free'ing it */
return doit(buf);