aboutsummaryrefslogtreecommitdiff
path: root/core/busybox/patches
diff options
context:
space:
mode:
Diffstat (limited to 'core/busybox/patches')
-rw-r--r--core/busybox/patches/modprobe-kernel-version.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/core/busybox/patches/modprobe-kernel-version.patch b/core/busybox/patches/modprobe-kernel-version.patch
index 2d4274ad..fb9b1859 100644
--- a/core/busybox/patches/modprobe-kernel-version.patch
+++ b/core/busybox/patches/modprobe-kernel-version.patch
@@ -1,8 +1,8 @@
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
-index 0a372a049..ecb29a8fd 100644
+index c334186b8..ff08b256f 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
-@@ -111,7 +111,7 @@
+@@ -110,7 +110,7 @@
//usage: " from the command line\n"
//usage:
//usage:#define modprobe_trivial_usage
@@ -11,7 +11,7 @@ index 0a372a049..ecb29a8fd 100644
//usage: " MODULE" IF_FEATURE_CMDLINE_MODULE_OPTIONS(" [SYMBOL=VALUE]...")
//usage:#define modprobe_full_usage "\n\n"
//usage: " -a Load multiple MODULEs"
-@@ -121,6 +121,7 @@
+@@ -120,6 +120,7 @@
//usage: "\n -v Verbose"
//usage: "\n -s Log to syslog"
//usage: "\n -D Show dependencies"
@@ -19,7 +19,7 @@ index 0a372a049..ecb29a8fd 100644
//usage: IF_FEATURE_MODPROBE_BLACKLIST(
//usage: "\n -b Apply blacklist to module names too"
//usage: )
-@@ -131,7 +132,7 @@
+@@ -130,7 +131,7 @@
* Note2: -b is always accepted, but if !FEATURE_MODPROBE_BLACKLIST,
* it is a no-op.
*/
@@ -28,7 +28,7 @@ index 0a372a049..ecb29a8fd 100644
/* -a and -D _are_ in fact compatible */
#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--arD:r--alD:a--lr:D--rl"
//#define MODPROBE_OPTS "acd:lnrt:C:b"
-@@ -147,7 +148,8 @@ enum {
+@@ -146,7 +147,8 @@ enum {
//OPT_VERONLY = (INSMOD_OPT_UNUSED << x), /* V */
//OPT_CONFIGFILE = (INSMOD_OPT_UNUSED << x), /* C */
OPT_SHOW_DEPS = (INSMOD_OPT_UNUSED << 3), /* D */
@@ -38,7 +38,7 @@ index 0a372a049..ecb29a8fd 100644
};
#if ENABLE_LONG_OPTS
static const char modprobe_longopts[] ALIGN1 =
-@@ -560,6 +562,7 @@ int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+@@ -557,6 +559,7 @@ int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int modprobe_main(int argc UNUSED_PARAM, char **argv)
{
int rc;
@@ -46,7 +46,7 @@ index 0a372a049..ecb29a8fd 100644
unsigned opt;
struct module_entry *me;
-@@ -567,13 +570,20 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
+@@ -564,13 +567,20 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
opt = getopt32long(argv, "^" INSMOD_OPTS MODPROBE_OPTS "\0" MODPROBE_COMPLEMENTARY,
modprobe_longopts
@@ -68,4 +68,4 @@ index 0a372a049..ecb29a8fd 100644
- uname(&G.uts);
xchdir(G.uts.release);
- if (opt & OPT_LIST_ONLY) { \ No newline at end of file
+ if (opt & OPT_LIST_ONLY) {