diff options
Diffstat (limited to 'modutils')
-rw-r--r-- | modutils/depmod.c | 2 | ||||
-rw-r--r-- | modutils/insmod.c | 2 | ||||
-rw-r--r-- | modutils/lsmod.c | 3 | ||||
-rw-r--r-- | modutils/modprobe-small.c | 6 | ||||
-rw-r--r-- | modutils/modprobe.c | 25 | ||||
-rw-r--r-- | modutils/rmmod.c | 2 |
6 files changed, 29 insertions, 11 deletions
diff --git a/modutils/depmod.c b/modutils/depmod.c index 006a7bcc1..6a43aa110 100644 --- a/modutils/depmod.c +++ b/modutils/depmod.c | |||
@@ -8,6 +8,8 @@ | |||
8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | //applet:IF_DEPMOD(APPLET(depmod, _BB_DIR_SBIN, _BB_SUID_DROP)) | ||
12 | |||
11 | #include "libbb.h" | 13 | #include "libbb.h" |
12 | #include "modutils.h" | 14 | #include "modutils.h" |
13 | #include <sys/utsname.h> /* uname() */ | 15 | #include <sys/utsname.h> /* uname() */ |
diff --git a/modutils/insmod.c b/modutils/insmod.c index 4fe388bdc..d1f1b076b 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
@@ -7,6 +7,8 @@ | |||
7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | //applet:IF_INSMOD(APPLET(insmod, _BB_DIR_SBIN, _BB_SUID_DROP)) | ||
11 | |||
10 | #include "libbb.h" | 12 | #include "libbb.h" |
11 | #include "modutils.h" | 13 | #include "modutils.h" |
12 | 14 | ||
diff --git a/modutils/lsmod.c b/modutils/lsmod.c index 9558a2510..a1477ed85 100644 --- a/modutils/lsmod.c +++ b/modutils/lsmod.c | |||
@@ -7,6 +7,9 @@ | |||
7 | * | 7 | * |
8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
9 | */ | 9 | */ |
10 | |||
11 | //applet:IF_LSMOD(APPLET(lsmod, _BB_DIR_SBIN, _BB_SUID_DROP)) | ||
12 | |||
10 | #include "libbb.h" | 13 | #include "libbb.h" |
11 | #include "unicode.h" | 14 | #include "unicode.h" |
12 | 15 | ||
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c index e0d251ee9..86470892a 100644 --- a/modutils/modprobe-small.c +++ b/modutils/modprobe-small.c | |||
@@ -8,6 +8,12 @@ | |||
8 | * Licensed under GPLv2, see file LICENSE in this source tree. | 8 | * Licensed under GPLv2, see file LICENSE in this source tree. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | //applet:IF_MODPROBE_SMALL(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP)) | ||
12 | //applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) | ||
13 | //applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) | ||
14 | //applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) | ||
15 | //applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) | ||
16 | |||
11 | #include "libbb.h" | 17 | #include "libbb.h" |
12 | /* After libbb.h, since it needs sys/types.h on some systems */ | 18 | /* After libbb.h, since it needs sys/types.h on some systems */ |
13 | #include <sys/utsname.h> /* uname() */ | 19 | #include <sys/utsname.h> /* uname() */ |
diff --git a/modutils/modprobe.c b/modutils/modprobe.c index ab35628f4..a5cf4babf 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c | |||
@@ -8,17 +8,7 @@ | |||
8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | /* Note that unlike older versions of modules.dep/depmod (busybox and m-i-t), | 11 | //applet:IF_MODPROBE(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP)) |
12 | * we expect the full dependency list to be specified in modules.dep. | ||
13 | * Older versions would only export the direct dependency list. | ||
14 | */ | ||
15 | #include "libbb.h" | ||
16 | #include "modutils.h" | ||
17 | #include <sys/utsname.h> | ||
18 | #include <fnmatch.h> | ||
19 | |||
20 | //#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__) | ||
21 | #define DBG(...) ((void)0) | ||
22 | 12 | ||
23 | //usage:#if !ENABLE_MODPROBE_SMALL | 13 | //usage:#if !ENABLE_MODPROBE_SMALL |
24 | //usage:#define modprobe_notes_usage | 14 | //usage:#define modprobe_notes_usage |
@@ -98,6 +88,19 @@ | |||
98 | //usage: ) | 88 | //usage: ) |
99 | //usage:#endif /* !ENABLE_MODPROBE_SMALL */ | 89 | //usage:#endif /* !ENABLE_MODPROBE_SMALL */ |
100 | 90 | ||
91 | #include "libbb.h" | ||
92 | #include "modutils.h" | ||
93 | #include <sys/utsname.h> | ||
94 | #include <fnmatch.h> | ||
95 | |||
96 | //#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__) | ||
97 | #define DBG(...) ((void)0) | ||
98 | |||
99 | /* Note that unlike older versions of modules.dep/depmod (busybox and m-i-t), | ||
100 | * we expect the full dependency list to be specified in modules.dep. | ||
101 | * Older versions would only export the direct dependency list. | ||
102 | */ | ||
103 | |||
101 | /* Note that usage text doesn't document various 2.4 options | 104 | /* Note that usage text doesn't document various 2.4 options |
102 | * we pull in through INSMOD_OPTS define */ | 105 | * we pull in through INSMOD_OPTS define */ |
103 | 106 | ||
diff --git a/modutils/rmmod.c b/modutils/rmmod.c index aa1bb01d6..51390eb83 100644 --- a/modutils/rmmod.c +++ b/modutils/rmmod.c | |||
@@ -8,6 +8,8 @@ | |||
8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | //applet:IF_RMMOD(APPLET(rmmod, _BB_DIR_SBIN, _BB_SUID_DROP)) | ||
12 | |||
11 | #include "libbb.h" | 13 | #include "libbb.h" |
12 | #include "modutils.h" | 14 | #include "modutils.h" |
13 | 15 | ||