mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[package] busybox: update to 1.19.2 (thanks to Peter Wagner)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28513 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user