summaryrefslogtreecommitdiff
path: root/package/busybox/busybox-1.12.1-modprobe.patch
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-11-13 16:32:52 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2008-11-13 16:32:52 +0000
commitbe4f829719800b261f76ce5d7b492cf4097fbe27 (patch)
treeefc29be74e4dfa907252608dca6553c2bcd48ac9 /package/busybox/busybox-1.12.1-modprobe.patch
parent14520e6fa3dd68cd491af4c1423bb0fd91ac740e (diff)
busybox: bump 1.12.x version
Diffstat (limited to 'package/busybox/busybox-1.12.1-modprobe.patch')
-rw-r--r--package/busybox/busybox-1.12.1-modprobe.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/package/busybox/busybox-1.12.1-modprobe.patch b/package/busybox/busybox-1.12.1-modprobe.patch
deleted file mode 100644
index a305c008c..000000000
--- a/package/busybox/busybox-1.12.1-modprobe.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urpN busybox-1.12.1/modutils/modprobe.c busybox-1.12.1-modprobe/modutils/modprobe.c
---- busybox-1.12.1/modutils/modprobe.c 2008-09-28 20:04:15.000000000 +0200
-+++ busybox-1.12.1-modprobe/modutils/modprobe.c 2008-10-10 14:36:58.000000000 +0200
-@@ -263,9 +263,9 @@ static int FAST_FUNC include_conf_dir_ac
- return TRUE;
- }
-
--static int include_conf_recursive(struct include_conf_t *conf, const char *filename)
-+static int include_conf_recursive(struct include_conf_t *conf, const char *filename, int flags)
- {
-- return recursive_action(filename, ACTION_RECURSE,
-+ return recursive_action(filename, ACTION_RECURSE | flags,
- include_conf_file_act,
- include_conf_dir_act,
- conf, 1);
-@@ -362,7 +362,7 @@ static int FAST_FUNC include_conf_file_a
- char *includefile;
-
- includefile = skip_whitespace(line_buffer + 8);
-- include_conf_recursive(conf, includefile);
-+ include_conf_recursive(conf, includefile, 0);
- } else if (ENABLE_FEATURE_MODPROBE_BLACKLIST &&
- (is_conf_command(line_buffer, "blacklist"))) {
- char *mod;
-@@ -559,7 +559,7 @@ static struct dep_t *build_dep(void)
- if (ENABLE_FEATURE_2_6_MODULES) {
- if (include_conf_file(&conf, "/etc/modprobe.conf"))
- r = TRUE;
-- if (include_conf_recursive(&conf, "/etc/modprobe.d"))
-+ if (include_conf_recursive(&conf, "/etc/modprobe.d", ACTION_QUIET))
- r = TRUE;
- }
- if (ENABLE_FEATURE_2_4_MODULES && !r)