diff options
| author | Pascal Bellard <pascal.bellard@ads-lu.com> | 2010-06-07 01:16:45 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-06-07 01:18:53 +0200 |
| commit | b82b34e06d0f8b91a1a30a847e0b1dd80ed0a046 (patch) | |
| tree | 17527de763a7e688023cb72a8ead602293b3b7b9 /modutils/modutils.h | |
| parent | e3657dcdd655ec96fc6bf38c40dd6a6f015a83de (diff) | |
| download | busybox-w32-b82b34e06d0f8b91a1a30a847e0b1dd80ed0a046.tar.gz busybox-w32-b82b34e06d0f8b91a1a30a847e0b1dd80ed0a046.tar.bz2 busybox-w32-b82b34e06d0f8b91a1a30a847e0b1dd80ed0a046.zip | |
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>
Diffstat (limited to 'modutils/modutils.h')
| -rw-r--r-- | modutils/modutils.h | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/modutils/modutils.h b/modutils/modutils.h index 131a5087b..d46870ca6 100644 --- a/modutils/modutils.h +++ b/modutils/modutils.h | |||
| @@ -23,32 +23,27 @@ int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC; | |||
| 23 | char *filename2modname(const char *filename, char *modname) FAST_FUNC; | 23 | char *filename2modname(const char *filename, char *modname) FAST_FUNC; |
| 24 | char *parse_cmdline_module_options(char **argv) FAST_FUNC; | 24 | char *parse_cmdline_module_options(char **argv) FAST_FUNC; |
| 25 | 25 | ||
| 26 | /* insmod for 2.4 and modprobe's options (insmod 2.6 has no options at all): */ | ||
| 26 | #define INSMOD_OPTS \ | 27 | #define INSMOD_OPTS \ |
| 27 | "vq" \ | 28 | "vqs" \ |
| 28 | IF_FEATURE_2_4_MODULES("sLo:fkx") \ | 29 | IF_FEATURE_2_4_MODULES("Lfkx" IF_FEATURE_INSMOD_LOAD_MAP("m")) |
| 29 | IF_FEATURE_INSMOD_LOAD_MAP("m") | 30 | #define INSMOD_ARGS /* (was meant to support -o NAME) , NULL */ |
| 30 | |||
| 31 | #define INSMOD_ARGS IF_FEATURE_2_4_MODULES(, NULL) | ||
| 32 | 31 | ||
| 33 | enum { | 32 | enum { |
| 34 | INSMOD_OPT_VERBOSE = 0x0001, | 33 | INSMOD_OPT_VERBOSE = (1 << 0), |
| 35 | INSMOD_OPT_SILENT = 0x0002, | 34 | INSMOD_OPT_SILENT = (1 << 1), |
| 36 | INSMOD_OPT_SYSLOG = 0x0004 * ENABLE_FEATURE_2_4_MODULES, | 35 | INSMOD_OPT_SYSLOG = (1 << 2), |
| 37 | INSMOD_OPT_LOCK = 0x0008 * ENABLE_FEATURE_2_4_MODULES, | 36 | //INSMOD_OPT_OUTPUTNAME = (1 << x) - not supported yet |
| 38 | INSMOD_OPT_OUTPUTNAME = 0x0010 * ENABLE_FEATURE_2_4_MODULES, | 37 | INSMOD_OPT_LOCK = (1 << 3) * ENABLE_FEATURE_2_4_MODULES, |
| 39 | INSMOD_OPT_FORCE = 0x0020 * ENABLE_FEATURE_2_4_MODULES, | 38 | INSMOD_OPT_FORCE = (1 << 4) * ENABLE_FEATURE_2_4_MODULES, |
| 40 | INSMOD_OPT_KERNELD = 0x0040 * ENABLE_FEATURE_2_4_MODULES, | 39 | INSMOD_OPT_KERNELD = (1 << 5) * ENABLE_FEATURE_2_4_MODULES, |
| 41 | INSMOD_OPT_NO_EXPORT = 0x0080 * ENABLE_FEATURE_2_4_MODULES, | 40 | INSMOD_OPT_NO_EXPORT = (1 << 6) * ENABLE_FEATURE_2_4_MODULES, |
| 42 | INSMOD_OPT_PRINT_MAP = 0x0100 * ENABLE_FEATURE_INSMOD_LOAD_MAP, | 41 | INSMOD_OPT_PRINT_MAP = (1 << 7) * ENABLE_FEATURE_INSMOD_LOAD_MAP, |
| 43 | #if ENABLE_FEATURE_2_4_MODULES | 42 | INSMOD_OPT_UNUSED = |
| 44 | # if ENABLE_FEATURE_INSMOD_LOAD_MAP | 43 | (INSMOD_OPT_PRINT_MAP ? INSMOD_OPT_PRINT_MAP |
| 45 | INSMOD_OPT_UNUSED = 0x0200, | 44 | : INSMOD_OPT_NO_EXPORT ? INSMOD_OPT_NO_EXPORT |
| 46 | # else | 45 | : INSMOD_OPT_SYSLOG |
| 47 | INSMOD_OPT_UNUSED = 0x0100, | 46 | ) << 1 |
| 48 | # endif | ||
| 49 | #else | ||
| 50 | INSMOD_OPT_UNUSED = 0x0004, | ||
| 51 | #endif | ||
| 52 | }; | 47 | }; |
| 53 | 48 | ||
| 54 | #if ENABLE_FEATURE_INSMOD_TRY_MMAP | 49 | #if ENABLE_FEATURE_INSMOD_TRY_MMAP |