diff options
| author | Denis Vlasenko | 2008-11-09 17:21:26 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-11-09 17:21:26 +0000 |
| commit | 84641942e5366b2e09367ba4f4376c99f15ecc8e (patch) | |
| tree | eff2511dcc6cb647e0bf898903f86c94b85466ad /modutils | |
| parent | bacaff6e5474d6c5f080ce4cd2a55e8ff1ba5c94 (diff) | |
| download | busybox-1_12_2.zip busybox-1_12_2.tar.gz | |
apply post-1.12.1 patches, bump version to 1.12.21_12_2
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/modprobe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c index 412e71d..8bbc239 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c @@ -263,9 +263,9 @@ static int FAST_FUNC include_conf_dir_act(const char *filename UNUSED_PARAM, 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_act(const char *filename, 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) |