aboutsummaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
Diffstat (limited to 'modutils')
-rw-r--r--modutils/insmod.c2
-rw-r--r--modutils/modprobe-small.c18
-rw-r--r--modutils/modprobe.c2
3 files changed, 9 insertions, 13 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 887d9f2a3..9c3c992a5 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -21,7 +21,7 @@
21//usage: IF_NOT_FEATURE_2_4_MODULES("FILE ") 21//usage: IF_NOT_FEATURE_2_4_MODULES("FILE ")
22//usage: "[SYMBOL=VALUE]..." 22//usage: "[SYMBOL=VALUE]..."
23//usage:#define insmod_full_usage "\n\n" 23//usage:#define insmod_full_usage "\n\n"
24//usage: "Load the specified kernel modules into the kernel" 24//usage: "Load kernel module"
25//usage: IF_FEATURE_2_4_MODULES( "\n" 25//usage: IF_FEATURE_2_4_MODULES( "\n"
26//usage: "\n -f Force module to load into the wrong kernel version" 26//usage: "\n -f Force module to load into the wrong kernel version"
27//usage: "\n -k Make module autoclean-able" 27//usage: "\n -k Make module autoclean-able"
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 5b7836344..023755db3 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -9,10 +9,10 @@
9 */ 9 */
10 10
11//applet:IF_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP)) 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)) 12//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, depmod))
13//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe)) 13//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, insmod))
14//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe)) 14//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, lsmod))
15//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe)) 15//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, rmmod))
16 16
17#include "libbb.h" 17#include "libbb.h"
18/* 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 */
@@ -583,7 +583,7 @@ static void process_module(char *name, const char *cmdline_options)
583// for the given alias. For example, 583// for the given alias. For example,
584// "pci:v00008086d00007010sv00000000sd00000000bc01sc01i80" matches 584// "pci:v00008086d00007010sv00000000sd00000000bc01sc01i80" matches
585// ata_piix because it has an alias "pci:v00008086d00007010sv*sd*bc*sc*i*" 585// ata_piix because it has an alias "pci:v00008086d00007010sv*sd*bc*sc*i*"
586// and ata_generic, it has an alias "alias=pci:v*d*sv*sd*bc01sc01i*" 586// and ata_generic, it has an alias "pci:v*d*sv*sd*bc01sc01i*"
587// Standard modprobe would load them both. 587// Standard modprobe would load them both.
588// In this code, find_alias() returns only the first matching module. 588// In this code, find_alias() returns only the first matching module.
589 589
@@ -703,10 +703,6 @@ The following options are useful for people managing distributions:
703 703
704//usage:#if ENABLE_MODPROBE_SMALL 704//usage:#if ENABLE_MODPROBE_SMALL
705 705
706//// Note: currently, help system shows modprobe --help text for all aliased cmds
707//// (see APPLET_ODDNAME macro definition).
708//// All other help texts defined below are not used. FIXME?
709
710//usage:#define depmod_trivial_usage NOUSAGE_STR 706//usage:#define depmod_trivial_usage NOUSAGE_STR
711//usage:#define depmod_full_usage "" 707//usage:#define depmod_full_usage ""
712 708
@@ -720,7 +716,7 @@ The following options are useful for people managing distributions:
720//usage: IF_NOT_FEATURE_2_4_MODULES("FILE ") 716//usage: IF_NOT_FEATURE_2_4_MODULES("FILE ")
721//usage: "[SYMBOL=VALUE]..." 717//usage: "[SYMBOL=VALUE]..."
722//usage:#define insmod_full_usage "\n\n" 718//usage:#define insmod_full_usage "\n\n"
723//usage: "Load the specified kernel modules into the kernel" 719//usage: "Load kernel module"
724//usage: IF_FEATURE_2_4_MODULES( "\n" 720//usage: IF_FEATURE_2_4_MODULES( "\n"
725//usage: "\n -f Force module to load into the wrong kernel version" 721//usage: "\n -f Force module to load into the wrong kernel version"
726//usage: "\n -k Make module autoclean-able" 722//usage: "\n -k Make module autoclean-able"
@@ -745,7 +741,7 @@ The following options are useful for people managing distributions:
745//usage: "$ rmmod tulip\n" 741//usage: "$ rmmod tulip\n"
746 742
747//usage:#define modprobe_trivial_usage 743//usage:#define modprobe_trivial_usage
748//usage: "[-qfwrsv] MODULE [symbol=value]..." 744//usage: "[-qfwrsv] MODULE [SYMBOL=VALUE]..."
749//usage:#define modprobe_full_usage "\n\n" 745//usage:#define modprobe_full_usage "\n\n"
750//usage: " -r Remove MODULE (stacks) or do autoclean" 746//usage: " -r Remove MODULE (stacks) or do autoclean"
751//usage: "\n -q Quiet" 747//usage: "\n -q Quiet"
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 7f7446d8e..f08f0850d 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -87,7 +87,7 @@
87//usage: 87//usage:
88//usage:#define modprobe_trivial_usage 88//usage:#define modprobe_trivial_usage
89//usage: "[-alrqvsD" IF_FEATURE_MODPROBE_BLACKLIST("b") "]" 89//usage: "[-alrqvsD" IF_FEATURE_MODPROBE_BLACKLIST("b") "]"
90//usage: " MODULE [symbol=value]..." 90//usage: " MODULE [SYMBOL=VALUE]..."
91//usage:#define modprobe_full_usage "\n\n" 91//usage:#define modprobe_full_usage "\n\n"
92//usage: " -a Load multiple MODULEs" 92//usage: " -a Load multiple MODULEs"
93//usage: "\n -l List (MODULE is a pattern)" 93//usage: "\n -l List (MODULE is a pattern)"