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/910-insmod-q-flag.patch | |
parent | 3fadea0d6f33da681b05f565130f2e8642371947 (diff) | |
download | upstream-d10b4495bcb7fa7bfdf1738097491f0ec4f75655.tar.gz upstream-d10b4495bcb7fa7bfdf1738097491f0ec4f75655.tar.bz2 upstream-d10b4495bcb7fa7bfdf1738097491f0ec4f75655.zip |
busybox: update to 1.19.2 (thanks to Peter Wagner)
SVN-Revision: 28513
Diffstat (limited to 'package/busybox/patches/910-insmod-q-flag.patch')
-rw-r--r-- | package/busybox/patches/910-insmod-q-flag.patch | 10 |
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)); |