diff options
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 412e71d16..8bbc2397c 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, | |||
| 263 | return TRUE; | 263 | return TRUE; |
| 264 | } | 264 | } |
| 265 | 265 | ||
| 266 | static int include_conf_recursive(struct include_conf_t *conf, const char *filename) | 266 | static int include_conf_recursive(struct include_conf_t *conf, const char *filename, int flags) |
| 267 | { | 267 | { |
| 268 | return recursive_action(filename, ACTION_RECURSE, | 268 | return recursive_action(filename, ACTION_RECURSE | flags, |
| 269 | include_conf_file_act, | 269 | include_conf_file_act, |
| 270 | include_conf_dir_act, | 270 | include_conf_dir_act, |
| 271 | conf, 1); | 271 | conf, 1); |
| @@ -362,7 +362,7 @@ static int FAST_FUNC include_conf_file_act(const char *filename, | |||
| 362 | char *includefile; | 362 | char *includefile; |
| 363 | 363 | ||
| 364 | includefile = skip_whitespace(line_buffer + 8); | 364 | includefile = skip_whitespace(line_buffer + 8); |
| 365 | include_conf_recursive(conf, includefile); | 365 | include_conf_recursive(conf, includefile, 0); |
| 366 | } else if (ENABLE_FEATURE_MODPROBE_BLACKLIST && | 366 | } else if (ENABLE_FEATURE_MODPROBE_BLACKLIST && |
| 367 | (is_conf_command(line_buffer, "blacklist"))) { | 367 | (is_conf_command(line_buffer, "blacklist"))) { |
| 368 | char *mod; | 368 | char *mod; |
| @@ -559,7 +559,7 @@ static struct dep_t *build_dep(void) | |||
| 559 | if (ENABLE_FEATURE_2_6_MODULES) { | 559 | if (ENABLE_FEATURE_2_6_MODULES) { |
| 560 | if (include_conf_file(&conf, "/etc/modprobe.conf")) | 560 | if (include_conf_file(&conf, "/etc/modprobe.conf")) |
| 561 | r = TRUE; | 561 | r = TRUE; |
| 562 | if (include_conf_recursive(&conf, "/etc/modprobe.d")) | 562 | if (include_conf_recursive(&conf, "/etc/modprobe.d", ACTION_QUIET)) |
| 563 | r = TRUE; | 563 | r = TRUE; |
| 564 | } | 564 | } |
| 565 | if (ENABLE_FEATURE_2_4_MODULES && !r) | 565 | if (ENABLE_FEATURE_2_4_MODULES && !r) |
