emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modprobe: accept -b even if blacklist functionality is disabled

Browse Source 
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Felipe Contreras 2012-01-31 14:55:15 +01:00 committed by Denys Vlasenko
parent c0657e0d0a
commit 428bd2d433
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modutils/modprobe-small.c
View File

@ -805,7 +805,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
opt_complementary = "-1"; opt_complementary = "-1";
/* only -q (quiet) and -r (rmmod), /* only -q (quiet) and -r (rmmod),
* the rest are accepted and ignored (compat) */ * the rest are accepted and ignored (compat) */
getopt32(argv, "qrfsvw"); getopt32(argv, "qrfsvwb");
argv += optind; argv += optind;
/* are we rmmod? -> simulate modprobe -r */ /* are we rmmod? -> simulate modprobe -r */

15
modutils/modprobe.c
View File

@ -101,12 +101,15 @@
//usage: ) //usage: )
//usage:#endif /* !ENABLE_MODPROBE_SMALL */ //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 */ /* -a and -D _are_ in fact compatible */
#define MODPROBE_COMPLEMENTARY ("q-v:v-q:l--arD:r--alD:a--lr:D--rl") #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" //#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--acr:a--lr:r--al"
enum { enum {
OPT_INSERT_ALL = (INSMOD_OPT_UNUSED << 0), /* a */ 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 /* module-init-tools 3.11.1 has only long opt --show-depends
* but no short -D, we provide long opt for scripts which * but no short -D, we provide long opt for scripts which
* were written for 3.11.1: */ * 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" // "use-blacklist\0" No_argument "b"
// )
; ;
#endif #endif