← Commit list

4423e5bee

Mike Frysinger
Mike Frysinger
2007-02-08
FAILED Duration: 16s

Subject

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

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

modutils/modprobe.c +8 -4
modutils/modprobe.c+8 -4
@@ -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);