aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/910-insmod-q-flag.patch
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2011-10-21 23:08:45 +0000
committerNicolas Thill <nico@openwrt.org>2011-10-21 23:08:45 +0000
commit3af110207d9034668fe9b714eb2074d280a57cce (patch)
treeaeaf726e05602de4a3b53c1a471a8d14de9f5453 /package/busybox/patches/910-insmod-q-flag.patch
parenta2797eb1a808a7999c0a33f160be5a5648af4a2a (diff)
downloadupstream-3af110207d9034668fe9b714eb2074d280a57cce.tar.gz
upstream-3af110207d9034668fe9b714eb2074d280a57cce.tar.bz2
upstream-3af110207d9034668fe9b714eb2074d280a57cce.zip
[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
Diffstat (limited to 'package/busybox/patches/910-insmod-q-flag.patch')
-rw-r--r--package/busybox/patches/910-insmod-q-flag.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/busybox/patches/910-insmod-q-flag.patch b/package/busybox/patches/910-insmod-q-flag.patch
index 596fe910de..6002f20f1b 100644
--- a/package/busybox/patches/910-insmod-q-flag.patch
+++ b/package/busybox/patches/910-insmod-q-flag.patch
@@ -1,6 +1,6 @@
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
-@@ -133,7 +133,7 @@ int insmod_main(int argc, char **argv) M
+@@ -139,7 +139,7 @@ int insmod_main(int argc, char **argv) M
int insmod_main(int argc UNUSED_PARAM, char **argv)
{
char *filename;
@@ -9,7 +9,7 @@
/* Compat note:
* 2.6 style insmod has no options and required filename
-@@ -143,10 +143,8 @@ int insmod_main(int argc UNUSED_PARAM, c
+@@ -149,10 +149,8 @@ int insmod_main(int argc UNUSED_PARAM, c
* or in $MODPATH.
*/
@@ -22,10 +22,10 @@
filename = *++argv;
if (!filename)
-@@ -157,7 +155,7 @@ int insmod_main(int argc UNUSED_PARAM, c
- goto done;
+@@ -163,7 +161,7 @@ int insmod_main(int argc UNUSED_PARAM, c
+ 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)
+ if (rc && !(opt & INSMOD_OPT_SILENT))
bb_error_msg("can't insert '%s': %s", filename, moderror(rc));