ifupdown: improve help text, add comment about run-parts error msg
authorDenys Vlasenko <vda.linux@googlemail.com>
Sun, 25 Sep 2016 00:05:24 +0000 (02:05 +0200)
committerDenys Vlasenko <vda.linux@googlemail.com>
Sun, 25 Sep 2016 00:05:24 +0000 (02:05 +0200)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
networking/ifupdown.c

index 5c24451ba393d126e5151180b70e950998aff62e..b0bc0d70f0cbb5233e18af0f47f561070419c328 100644 (file)
@@ -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);