modprobe: accept -b even if blacklist functionality is disabled
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index f5b283b..5ea1be9 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -805,7 +805,7 @@
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 c1a1828..fb6c659 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
- * we pull in through INSMOD_OPTS define */
-#define MODPROBE_OPTS "alrD" IF_FEATURE_MODPROBE_BLACKLIST("b")
+/* Note: usage text doesn't document various 2.4 options
+ * we pull in through INSMOD_OPTS define
+ * 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 @@
/* 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"
- // IF_FEATURE_MODPROBE_BLACKLIST(
+ "show-depends\0" No_argument "D"
// "use-blacklist\0" No_argument "b"
- // )
;
#endif