modprobe: add support for -l and -s. Remove some unsupported options

Fixed some goofs in help text

function                                             old     new   delta
modprobe_main                                        494     653    +159
packed_usage                                       27129   27145     +16
insmod_main                                           98      95      -3

Signed-off-by: Pascal Bellard <pascal.bellard@ads-lu.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 22 insertions, 0 deletions

diff --git a/modutils/insmod.c b/modutils/insmod.c
index c4fb9279d..b88446c10 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -10,6 +10,28 @@
 #include "libbb.h"
 #include "modutils.h"
 
+/* 2.6 style insmod has no options and required filename
+ * (not module name - .ko can't be omitted) */
+
+//usage:#define insmod_trivial_usage
+//usage:        IF_FEATURE_2_4_MODULES("[OPTIONS] MODULE ")
+//usage:        IF_NOT_FEATURE_2_4_MODULES("FILE ")
+//usage:        "[symbol=value]..."
+//usage:#define insmod_full_usage "\n\n"
+//usage:       "Load the specified kernel modules into the kernel"
+//usage:        IF_FEATURE_2_4_MODULES( "\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -f      Force module to load into the wrong kernel version"
+//usage:     "\n        -k      Make module autoclean-able"
+//usage:     "\n        -v      Verbose"
+//usage:     "\n        -q      Quiet"
+//usage:     "\n        -L      Lock: prevent simultaneous loads"
+//usage:        IF_FEATURE_INSMOD_LOAD_MAP(
+//usage:     "\n        -m      Output load map to stdout"
+//usage:        )
+//usage:     "\n        -x      Don't export externs"
+//usage:        )
+
 int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int insmod_main(int argc UNUSED_PARAM, char **argv)
 {