summaryrefslogtreecommitdiff
path: root/package/busybox/patches/470-insmod_search.patch
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-09-28 12:38:46 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-09-28 12:38:46 +0000
commit9dfc3e34ee54d00b68cc4cbb5cddcfa588fd07fb (patch)
tree0c8df24973e5339e60c5aae5a5d461d18d373cac /package/busybox/patches/470-insmod_search.patch
parent21e17d6ad463edff7baf6e25a30041dcf22a8c4e (diff)
[package] busybox: update to v1.14.4 (closes: #5619)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17782 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox/patches/470-insmod_search.patch')
-rw-r--r--package/busybox/patches/470-insmod_search.patch17
1 files changed, 14 insertions, 3 deletions
diff --git a/package/busybox/patches/470-insmod_search.patch b/package/busybox/patches/470-insmod_search.patch
index 5825dac9f2..cc7ca79ce0 100644
--- a/package/busybox/patches/470-insmod_search.patch
+++ b/package/busybox/patches/470-insmod_search.patch
@@ -100,7 +100,7 @@
int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int insmod_main(int argc UNUSED_PARAM, char **argv)
-@@ -25,9 +118,14 @@ int insmod_main(int argc UNUSED_PARAM, c
+@@ -33,9 +126,15 @@ int insmod_main(int argc UNUSED_PARAM, c
if (!filename)
bb_show_usage();
@@ -111,9 +111,20 @@
+
+ rc = bb_init_module(g_filename, parse_cmdline_module_options(argv));
if (rc)
- bb_error_msg("cannot insert '%s': %s", filename, moderror(rc));
--
+ bb_error_msg("can't insert '%s': %s", filename, moderror(rc));
+ free (g_filename);
+
+done:
return rc;
}
+--- a/modutils/Config.in
++++ b/modutils/Config.in
+@@ -211,7 +211,7 @@ config FEATURE_MODUTILS_SYMBOLS
+ config DEFAULT_MODULES_DIR
+ string "Default directory containing modules"
+ default "/lib/modules"
+- depends on DEPMOD || MODPROBE || MODPROBE_SMALL
++ depends on DEPMOD || INSMOD || MODPROBE || MODPROBE_SMALL
+ help
+ Directory that contains kernel modules.
+ Defaults to "/lib/modules"