busybox-modprobe.patch

   1 diff -urpN busybox-1.12.1/modutils/modprobe.c busybox-1.12.1-modprobe/modutils/modprobe.c
   2 --- busybox-1.12.1/modutils/modprobe.c  2008-09-28 20:04:15.000000000 +0200
   3 +++ busybox-1.12.1-modprobe/modutils/modprobe.c 2008-10-10 14:36:58.000000000 +0200
   4 @@ -263,9 +263,9 @@ static int FAST_FUNC include_conf_dir_ac
   5         return TRUE;
   6  }
   7
   8 -static int include_conf_recursive(struct include_conf_t *conf, const char *filename)
   9 +static int include_conf_recursive(struct include_conf_t *conf, const char *filename, int flags)
  10  {
  11 -       return recursive_action(filename, ACTION_RECURSE,
  12 +       return recursive_action(filename, ACTION_RECURSE | flags,
  13                                 include_conf_file_act,
  14                                 include_conf_dir_act,
  15                                 conf, 1);
  16 @@ -362,7 +362,7 @@ static int FAST_FUNC include_conf_file_a
  17                         char *includefile;
  18
  19                         includefile = skip_whitespace(line_buffer + 8);
  20 -                       include_conf_recursive(conf, includefile);
  21 +                       include_conf_recursive(conf, includefile, 0);
  22                 } else if (ENABLE_FEATURE_MODPROBE_BLACKLIST &&
  23                                 (is_conf_command(line_buffer, "blacklist"))) {
  24                         char *mod;
  25 @@ -559,7 +559,7 @@ static struct dep_t *build_dep(void)
  26                 if (ENABLE_FEATURE_2_6_MODULES) {
  27                         if (include_conf_file(&conf, "/etc/modprobe.conf"))
  28                                 r = TRUE;
  29 -                       if (include_conf_recursive(&conf, "/etc/modprobe.d"))
  30 +                       if (include_conf_recursive(&conf, "/etc/modprobe.d", ACTION_QUIET))
  31                                 r = TRUE;
  32                 }
  33                 if (ENABLE_FEATURE_2_4_MODULES && !r)