summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger2007-02-08 07:03:44 +0000
committerMike Frysinger2007-02-08 07:03:44 +0000
commit4423e5beefd6f17dfa836211899ee70edcc64a5b (patch)
treeddc279b9fa00de53995e696b80671e82bcbb191c
parentc5d9e8ff3d5c820606bd2e82c1ca20b1e5855e5f (diff)
downloadbusybox-4423e5beefd6f17dfa836211899ee70edcc64a5b.zip
busybox-4423e5beefd6f17dfa836211899ee70edcc64a5b.tar.gz
/etc/modules.conf is a 2.6.x file while /etc/modules.conf and /etc/conf.modules are 2.4.x and older files
-rw-r--r--modutils/modprobe.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 5e7486a..57e19b4 100644
--- 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);