[git commit] modprobe_small: if only MODPROBE and DEPMOD are selected, no need to test for them
Denys Vlasenko
vda.linux at googlemail.com
Tue Feb 7 15:41:25 UTC 2017
commit: https://git.busybox.net/busybox/commit/?id=c2b18583a3df06aeecf535c3cea6856aa1f2e205
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
function old new delta
modprobe_main 321 306 -15
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
modutils/modprobe-small.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index d6f4814..431b8ae 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -928,7 +928,9 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
/* Prevent ugly corner cases with no modules at all */
modinfo = xzalloc(sizeof(modinfo[0]));
- if (is_depmod || is_modprobe) {
+ if ((MOD_APPLET_CNT == 2 && ENABLE_DEPMOD && ENABLE_MODPROBE)
+ || is_depmod || is_modprobe
+ ) {
/* Goto modules directory */
xchdir(CONFIG_DEFAULT_MODULES_DIR);
uname(&uts); /* never fails */
More information about the busybox-cvs
mailing list