aboutsummaryrefslogtreecommitdiff
path: root/modutils/modprobe.c
diff options
context:
space:
mode:
Diffstat (limited to 'modutils/modprobe.c')
-rw-r--r--modutils/modprobe.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 1a7db09f2..59f6d54f3 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -26,7 +26,7 @@
26//config: hardware autodetection scripts to load modules like evdev, frame 26//config: hardware autodetection scripts to load modules like evdev, frame
27//config: buffer drivers etc. 27//config: buffer drivers etc.
28 28
29//applet:IF_MODPROBE(IF_NOT_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP))) 29//applet:IF_MODPROBE(IF_NOT_MODPROBE_SMALL(APPLET_NOEXEC(modprobe, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe)))
30 30
31//kbuild:ifneq ($(CONFIG_MODPROBE_SMALL),y) 31//kbuild:ifneq ($(CONFIG_MODPROBE_SMALL),y)
32//kbuild:lib-$(CONFIG_MODPROBE) += modprobe.o modutils.o 32//kbuild:lib-$(CONFIG_MODPROBE) += modprobe.o modutils.o
@@ -133,7 +133,7 @@
133 */ 133 */
134#define MODPROBE_OPTS "alrDb" 134#define MODPROBE_OPTS "alrDb"
135/* -a and -D _are_ in fact compatible */ 135/* -a and -D _are_ in fact compatible */
136#define MODPROBE_COMPLEMENTARY ("q-v:v-q:l--arD:r--alD:a--lr:D--rl") 136#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--arD:r--alD:a--lr:D--rl"
137//#define MODPROBE_OPTS "acd:lnrt:C:b" 137//#define MODPROBE_OPTS "acd:lnrt:C:b"
138//#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--acr:a--lr:r--al" 138//#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--acr:a--lr:r--al"
139enum { 139enum {
@@ -566,9 +566,10 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
566 566
567 INIT_G(); 567 INIT_G();
568 568
569 IF_LONG_OPTS(applet_long_options = modprobe_longopts;) 569 opt = getopt32long(argv, "^" INSMOD_OPTS MODPROBE_OPTS "\0" MODPROBE_COMPLEMENTARY,
570 opt_complementary = MODPROBE_COMPLEMENTARY; 570 modprobe_longopts
571 opt = getopt32(argv, INSMOD_OPTS MODPROBE_OPTS INSMOD_ARGS); 571 INSMOD_ARGS
572 );
572 argv += optind; 573 argv += optind;
573 574
574 /* Goto modules location */ 575 /* Goto modules location */