diff options
author | Kang-Che Sung <explorer09@gmail.com> | 2017-01-31 21:09:17 +0800 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-02-01 10:14:05 +0100 |
commit | b1d6a2c6247bae0b9f1903ba0e0d16c56f4ef556 (patch) | |
tree | afc10aba770e711341483ef13b95ab3ac4916f9b /modutils/modutils.h | |
parent | 264cb01540cdd995e7c376fd8bcef94e09e31819 (diff) | |
download | busybox-w32-b1d6a2c6247bae0b9f1903ba0e0d16c56f4ef556.tar.gz busybox-w32-b1d6a2c6247bae0b9f1903ba0e0d16c56f4ef556.tar.bz2 busybox-w32-b1d6a2c6247bae0b9f1903ba0e0d16c56f4ef556.zip |
cmdline module options can be disabled on "big" modutils
Allow module options on command line to be disabled on "big" modutils.
Config FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is renamed to
FEATURE_CMDLINE_MODULE_OPTIONS and no longer depends on !MODPROBE_SMALL
(I'm not sure if disabling this is useful on "big" modutils, but at
least the macro can serve as a marker and ensure both implementations
of same feature have consistent behavior.)
Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'modutils/modutils.h')
-rw-r--r-- | modutils/modutils.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/modutils/modutils.h b/modutils/modutils.h index 2cbd1448a..76ce242ba 100644 --- a/modutils/modutils.h +++ b/modutils/modutils.h | |||
@@ -51,7 +51,11 @@ void replace(char *s, char what, char with) FAST_FUNC; | |||
51 | char *replace_underscores(char *s) FAST_FUNC; | 51 | char *replace_underscores(char *s) FAST_FUNC; |
52 | int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC; | 52 | int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC; |
53 | char *filename2modname(const char *filename, char *modname) FAST_FUNC; | 53 | char *filename2modname(const char *filename, char *modname) FAST_FUNC; |
54 | #if ENABLE_FEATURE_CMDLINE_MODULE_OPTIONS | ||
54 | char *parse_cmdline_module_options(char **argv, int quote_spaces) FAST_FUNC; | 55 | char *parse_cmdline_module_options(char **argv, int quote_spaces) FAST_FUNC; |
56 | #else | ||
57 | # define parse_cmdline_module_options(argv, quote_spaces) "" | ||
58 | #endif | ||
55 | 59 | ||
56 | /* insmod for 2.4 and modprobe's options (insmod 2.6 has no options at all): */ | 60 | /* insmod for 2.4 and modprobe's options (insmod 2.6 has no options at all): */ |
57 | #define INSMOD_OPTS \ | 61 | #define INSMOD_OPTS \ |