/etc/modules.conf is a 2.6.x file while /etc/modules.conf and /etc/conf.modules are...

diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 5e7486a8117e8807aa9469ce1ccca9597218e5e4..57e19b4abd1534ed0f9d53769b0199f082603d61 100644 (file)
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -496,11 +496,15 @@ static struct dep_t *build_dep(void)
        /*
         * First parse system-specific options and aliases
         * as they take precedence over the kernel ones.
+        * >=2.6: we only care about modprobe.conf
+        * <=2.4: we care about modules.conf and conf.modules
         */
-       if (!ENABLE_FEATURE_2_6_MODULES
-        || (fd = open("/etc/modprobe.conf", O_RDONLY)) < 0)
-               if ((fd = open("/etc/modules.conf", O_RDONLY)) < 0)
-                       fd = open("/etc/conf.modules", O_RDONLY);
+       if (ENABLE_FEATURE_2_6_MODULES
+        && (fd = open("/etc/modprobe.conf", O_RDONLY)) < 0)
+               if (ENABLE_FEATURE_2_4_MODULES
+                && (fd = open("/etc/modules.conf", O_RDONLY)) < 0)
+                       if (ENABLE_FEATURE_2_4_MODULES)
+                               fd = open("/etc/conf.modules", O_RDONLY);
 
        if (fd >= 0) {
                include_conf(&first, &current, buffer, sizeof(buffer), fd);