X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=package%2Fbusybox%2Fpatches%2F470-insmod_search.patch;h=cc7ca79ce0c5a32e08fd295dafd24f044884a063;hp=8d4b019c6b3af8b8e57d098d0f9b3383c879967d;hb=9dfc3e34ee54d00b68cc4cbb5cddcfa588fd07fb;hpb=e53ecb012ec4b2b87bb9ab35741241590b552a68

diff --git a/package/busybox/patches/470-insmod_search.patch b/package/busybox/patches/470-insmod_search.patch
index 8d4b019c6..cc7ca79ce 100644
--- a/package/busybox/patches/470-insmod_search.patch
+++ b/package/busybox/patches/470-insmod_search.patch
@@ -4,11 +4,11 @@
  
  #include "libbb.h"
  #include "modutils.h"
++#include <sys/utsname.h>
 +#ifndef CONFIG_FEATURE_2_4_MODULES
 +#include <sys/mman.h>
 +#include <asm/unistd.h>
 +#include <sys/syscall.h>
-+#include <sys/utsname.h>
 +#endif
 +
 +static char *g_filename = NULL;
@@ -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"