3 files changed, 31 insertions, 17 deletions
diff --git a/modutils/depmod.c b/modutils/depmod.c
index f6c0bf33a..775236126 100644
--- a/modutils/depmod.c
+++ b/modutils/depmod.c
@@ -10,11 +10,6 @@
 //applet:IF_DEPMOD(APPLET(depmod, BB_DIR_SBIN, BB_SUID_DROP))
-//usage:#if !ENABLE_MODPROBE_SMALL
-//usage:#define depmod_trivial_usage NOUSAGE_STR
-//usage:#define depmod_full_usage ""
-//usage:#endif
 #include "libbb.h"
 #include "modutils.h"
 #include <sys/utsname.h> /* uname() */
@@ -131,7 +126,16 @@ static void xfreopen_write(const char *file, FILE *f)
                bb_perror_msg_and_die("can't open '%s'", file);
 }
-/* Usage:
+//usage:#if !ENABLE_MODPROBE_SMALL
+//usage:#define depmod_trivial_usage "[-n] [-b BASE] [VERSION] [MODFILES]..."
+//usage:#define depmod_full_usage "\n\n"
+//usage:       "Generate modules.dep, alias, and symbols files"
+//usage:     "\n"
+//usage:     "\n        -b BASE Use BASE/lib/modules/VERSION"
+//usage:     "\n        -n      Dry run: print files to stdout"
+//usage:#endif
+/* Upstream usage:
 * [-aAenv] [-C FILE or DIR] [-b BASE] [-F System.map] [VERSION] [MODFILES]...
 *      -a --all
 *              Probe all modules. Default if no MODFILES.
@@ -142,7 +146,7 @@ static void xfreopen_write(const char *file, FILE *f)
 *      -C --config FILE or DIR
 *              Path to /etc/depmod.conf or /etc/depmod.d/
 *      -e --errsyms
- *              When combined with the -F option, this reports any symbols which
+ *              When combined with the -F option, this reports any symbols
 *              which are not supplied by other modules or kernel.
 *      -F --filesyms System.map
 *      -n --dry-run
@@ -154,8 +158,13 @@ static void xfreopen_write(const char *file, FILE *f)
 *      -u      No-op
 *      -q      No-op
 *
- * So far we only support: [-rn] [-b BASE] [VERSION] [MODFILES]...
+ * So far we only support: [-n] [-b BASE] [VERSION] [MODFILES]...
- * -aAeF are accepted but ignored. -vC are not accepted.
+ * Accepted but ignored:
+ * -aAe
+ * -F System.map
+ * -C FILE/DIR
+ *
+ * Not accepted: -v
 */
 enum {
        //OPT_a = (1 << 0), /* All modules, ignore mods in argv */
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index f5b283b47..bd855f628 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -696,6 +696,10 @@ The following options are useful for people managing distributions:
 //usage:#if ENABLE_MODPROBE_SMALL
+//// Note: currently, help system shows modprobe --help text for all aliased cmds
+//// (see APPLET_ODDNAME macro definition).
+//// All other help texts defined below are not used. FIXME?
 //usage:#define depmod_trivial_usage NOUSAGE_STR
 //usage:#define depmod_full_usage ""
@@ -805,7 +809,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
        opt_complementary = "-1";
        /* only -q (quiet) and -r (rmmod),
         * the rest are accepted and ignored (compat) */
-        getopt32(argv, "qrfsvw");
+        getopt32(argv, "qrfsvwb");
        argv += optind;
        /* are we rmmod? -> simulate modprobe -r */
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index c1a1828d7..fb6c65990 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -101,12 +101,15 @@
 //usage:        )
 //usage:#endif /* !ENABLE_MODPROBE_SMALL */
-/* Note that usage text doesn't document various 2.4 options
+/* Note: usage text doesn't document various 2.4 options
- * we pull in through INSMOD_OPTS define */
+ * we pull in through INSMOD_OPTS define
-#define MODPROBE_OPTS  "alrD" IF_FEATURE_MODPROBE_BLACKLIST("b")
+ * Note2: -b is always accepted, but if !FEATURE_MODPROBE_BLACKLIST,
+ * it is a no-op.
+ */
+#define MODPROBE_OPTS  "alrDb"
 /* -a and -D _are_ in fact compatible */
 #define MODPROBE_COMPLEMENTARY ("q-v:v-q:l--arD:r--alD:a--lr:D--rl")
-//#define MODPROBE_OPTS  "acd:lnrt:C:" IF_FEATURE_MODPROBE_BLACKLIST("b")
+//#define MODPROBE_OPTS  "acd:lnrt:C:b"
 //#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--acr:a--lr:r--al"
 enum {
        OPT_INSERT_ALL   = (INSMOD_OPT_UNUSED << 0), /* a */
@@ -133,10 +136,8 @@ static const char modprobe_longopts[] ALIGN1 =
        /* module-init-tools 3.11.1 has only long opt --show-depends
         * but no short -D, we provide long opt for scripts which
         * were written for 3.11.1: */
-        "show-depends\0" No_argument "D"
+        "show-depends\0"     No_argument "D"
-        // IF_FEATURE_MODPROBE_BLACKLIST(
        // "use-blacklist\0" No_argument "b"
-        // )
        ;
 #endif