diff options
author | Nicolas Thill <nico@openwrt.org> | 2011-10-21 23:08:45 +0000 |
---|---|---|
committer | Nicolas Thill <nico@openwrt.org> | 2011-10-21 23:08:45 +0000 |
commit | d10b4495bcb7fa7bfdf1738097491f0ec4f75655 (patch) | |
tree | 582ab3d138a618bb22578bca4be5e1720caab80a /package/busybox/patches/470-insmod_search.patch | |
parent | 3fadea0d6f33da681b05f565130f2e8642371947 (diff) | |
download | master-31e0f0ae-d10b4495bcb7fa7bfdf1738097491f0ec4f75655.tar.gz master-31e0f0ae-d10b4495bcb7fa7bfdf1738097491f0ec4f75655.tar.bz2 master-31e0f0ae-d10b4495bcb7fa7bfdf1738097491f0ec4f75655.zip |
busybox: update to 1.19.2 (thanks to Peter Wagner)
SVN-Revision: 28513
Diffstat (limited to 'package/busybox/patches/470-insmod_search.patch')
-rw-r--r-- | package/busybox/patches/470-insmod_search.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/package/busybox/patches/470-insmod_search.patch b/package/busybox/patches/470-insmod_search.patch index b5314e3f0d..7f0188fc82 100644 --- a/package/busybox/patches/470-insmod_search.patch +++ b/package/busybox/patches/470-insmod_search.patch @@ -1,3 +1,14 @@ +--- a/modutils/Config.src ++++ b/modutils/Config.src +@@ -247,7 +247,7 @@ config FEATURE_MODUTILS_SYMBOLS + config DEFAULT_MODULES_DIR + string "Default directory containing modules" + default "/lib/modules" +- depends on DEPMOD || MODPROBE || MODPROBE_SMALL || MODINFO ++ depends on DEPMOD || INSMOD || MODPROBE || MODPROBE_SMALL || MODINFO + help + Directory that contains kernel modules. + Defaults to "/lib/modules" --- a/modutils/insmod.c +++ b/modutils/insmod.c @@ -11,6 +11,106 @@ @@ -107,16 +118,16 @@ /* 2.6 style insmod has no options and required filename * (not module name - .ko can't be omitted) */ -@@ -59,9 +159,15 @@ int insmod_main(int argc UNUSED_PARAM, c +@@ -58,9 +158,15 @@ int insmod_main(int argc UNUSED_PARAM, c if (!filename) bb_show_usage(); -- rc = bb_init_module(filename, parse_cmdline_module_options(argv)); +- rc = bb_init_module(filename, parse_cmdline_module_options(argv, /*quote_spaces:*/ 0)); + rc = find_module(filename); + if (rc || (g_filename == NULL)) -+ goto done; ++ goto done; + -+ rc = bb_init_module(g_filename, parse_cmdline_module_options(argv)); ++ rc = bb_init_module(g_filename, parse_cmdline_module_options(argv, /*quote_spaces:*/ 0)); if (rc) bb_error_msg("can't insert '%s': %s", filename, moderror(rc)); + free (g_filename); @@ -124,14 +135,3 @@ +done: return rc; } ---- a/modutils/Config.src -+++ b/modutils/Config.src -@@ -229,7 +229,7 @@ config FEATURE_MODUTILS_SYMBOLS - config DEFAULT_MODULES_DIR - string "Default directory containing modules" - default "/lib/modules" -- depends on DEPMOD || MODPROBE || MODPROBE_SMALL || MODINFO -+ depends on DEPMOD || INSMOD || MODPROBE || MODPROBE_SMALL || MODINFO - help - Directory that contains kernel modules. - Defaults to "/lib/modules" |