diff options
| -rw-r--r-- | include/applets.src.h | 10 | ||||
| -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 |
7 files changed, 29 insertions, 21 deletions
diff --git a/include/applets.src.h b/include/applets.src.h index a42f6fffa..879dbf760 100644 --- a/include/applets.src.h +++ b/include/applets.src.h @@ -103,8 +103,6 @@ IF_DD(APPLET_NOEXEC(dd, dd, _BB_DIR_BIN, _BB_SUID_DROP, dd)) IF_DEALLOCVT(APPLET(deallocvt, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_DELGROUP(APPLET_ODDNAME(delgroup, deluser, _BB_DIR_BIN, _BB_SUID_DROP, delgroup)) IF_DELUSER(APPLET(deluser, _BB_DIR_BIN, _BB_SUID_DROP)) -IF_DEPMOD(APPLET(depmod, _BB_DIR_SBIN, _BB_SUID_DROP)) -IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) IF_DEVFSD(APPLET(devfsd, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_DEVMEM(APPLET(devmem, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_DF(APPLET(df, _BB_DIR_BIN, _BB_SUID_DROP)) @@ -179,8 +177,6 @@ IF_IFPLUGD(APPLET(ifplugd, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_IFUPDOWN(APPLET_ODDNAME(ifup, ifupdown, _BB_DIR_SBIN, _BB_SUID_DROP, ifup)) IF_INETD(APPLET(inetd, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) IF_INOTIFYD(APPLET(inotifyd, _BB_DIR_SBIN, _BB_SUID_DROP)) -IF_INSMOD(APPLET(insmod, _BB_DIR_SBIN, _BB_SUID_DROP)) -IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) IF_INSTALL(APPLET(install, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_IONICE(APPLET(ionice, _BB_DIR_BIN, _BB_SUID_DROP)) #if ENABLE_FEATURE_IP_ADDRESS \ @@ -222,8 +218,6 @@ IF_LPQ(APPLET_ODDNAME(lpq, lpqr, _BB_DIR_USR_BIN, _BB_SUID_DROP, lpq)) IF_LPR(APPLET_ODDNAME(lpr, lpqr, _BB_DIR_USR_BIN, _BB_SUID_DROP, lpr)) IF_LS(APPLET_NOEXEC(ls, ls, _BB_DIR_BIN, _BB_SUID_DROP, ls)) IF_LSATTR(APPLET(lsattr, _BB_DIR_BIN, _BB_SUID_DROP)) -IF_LSMOD(APPLET(lsmod, _BB_DIR_SBIN, _BB_SUID_DROP)) -IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) IF_LSPCI(APPLET(lspci, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_LSUSB(APPLET(lsusb, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_UNLZMA(APPLET_ODDNAME(lzcat, unlzma, _BB_DIR_USR_BIN, _BB_SUID_DROP, lzcat)) @@ -250,8 +244,6 @@ IF_MKNOD(APPLET_NOEXEC(mknod, mknod, _BB_DIR_BIN, _BB_SUID_DROP, mknod)) IF_CRYPTPW(APPLET_ODDNAME(mkpasswd, cryptpw, _BB_DIR_USR_BIN, _BB_SUID_DROP, mkpasswd)) IF_MKSWAP(APPLET(mkswap, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_MKTEMP(APPLET(mktemp, _BB_DIR_BIN, _BB_SUID_DROP)) -IF_MODPROBE(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP)) -IF_MODPROBE_SMALL(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_MORE(APPLET(more, _BB_DIR_BIN, _BB_SUID_DROP)) IF_MOUNT(APPLET(mount, _BB_DIR_BIN, IF_DESKTOP(_BB_SUID_MAYBE) IF_NOT_DESKTOP(_BB_SUID_DROP))) IF_MOUNTPOINT(APPLET(mountpoint, _BB_DIR_BIN, _BB_SUID_DROP)) @@ -298,8 +290,6 @@ IF_RESTORECON(APPLET_ODDNAME(restorecon, setfiles, _BB_DIR_SBIN, _BB_SUID_DROP, IF_RFKILL(APPLET(rfkill, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) IF_RM(APPLET_NOFORK(rm, rm, _BB_DIR_BIN, _BB_SUID_DROP, rm)) IF_RMDIR(APPLET_NOFORK(rmdir, rmdir, _BB_DIR_BIN, _BB_SUID_DROP, rmdir)) -IF_RMMOD(APPLET(rmmod, _BB_DIR_SBIN, _BB_SUID_DROP)) -IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) IF_ROUTE(APPLET(route, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_RPM(APPLET(rpm, _BB_DIR_BIN, _BB_SUID_DROP)) IF_RPM2CPIO(APPLET(rpm2cpio, _BB_DIR_USR_BIN, _BB_SUID_DROP)) 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 @@ * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//applet:IF_DEPMOD(APPLET(depmod, _BB_DIR_SBIN, _BB_SUID_DROP)) + #include "libbb.h" #include "modutils.h" #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 @@ * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//applet:IF_INSMOD(APPLET(insmod, _BB_DIR_SBIN, _BB_SUID_DROP)) + #include "libbb.h" #include "modutils.h" 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 @@ * * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ + +//applet:IF_LSMOD(APPLET(lsmod, _BB_DIR_SBIN, _BB_SUID_DROP)) + #include "libbb.h" #include "unicode.h" 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 @@ * Licensed under GPLv2, see file LICENSE in this source tree. */ +//applet:IF_MODPROBE_SMALL(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP)) +//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) +//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) +//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) +//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) + #include "libbb.h" /* After libbb.h, since it needs sys/types.h on some systems */ #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 @@ * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -/* Note that unlike older versions of modules.dep/depmod (busybox and m-i-t), - * we expect the full dependency list to be specified in modules.dep. - * Older versions would only export the direct dependency list. - */ -#include "libbb.h" -#include "modutils.h" -#include <sys/utsname.h> -#include <fnmatch.h> - -//#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__) -#define DBG(...) ((void)0) +//applet:IF_MODPROBE(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP)) //usage:#if !ENABLE_MODPROBE_SMALL //usage:#define modprobe_notes_usage @@ -98,6 +88,19 @@ //usage: ) //usage:#endif /* !ENABLE_MODPROBE_SMALL */ +#include "libbb.h" +#include "modutils.h" +#include <sys/utsname.h> +#include <fnmatch.h> + +//#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__) +#define DBG(...) ((void)0) + +/* Note that unlike older versions of modules.dep/depmod (busybox and m-i-t), + * we expect the full dependency list to be specified in modules.dep. + * Older versions would only export the direct dependency list. + */ + /* Note that usage text doesn't document various 2.4 options * we pull in through INSMOD_OPTS define */ 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 @@ * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ +//applet:IF_RMMOD(APPLET(rmmod, _BB_DIR_SBIN, _BB_SUID_DROP)) + #include "libbb.h" #include "modutils.h" |