Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-12 14:30:54 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mike Frysinger 2007-02-08 07:03:44 +00:00
parent c5d9e8ff3d
commit 4423e5beef
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modutils/modprobe.c
View File

@ -496,11 +496,15 @@ static struct dep_t *build_dep(void)
/* /*
* First parse system-specific options and aliases * First parse system-specific options and aliases
* as they take precedence over the kernel ones. * 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 if (ENABLE_FEATURE_2_6_MODULES
|| (fd = open("/etc/modprobe.conf", O_RDONLY)) < 0) && (fd = open("/etc/modprobe.conf", O_RDONLY)) < 0)
if ((fd = open("/etc/modules.conf", O_RDONLY)) < 0) if (ENABLE_FEATURE_2_4_MODULES
fd = open("/etc/conf.modules", O_RDONLY); && (fd = open("/etc/modules.conf", O_RDONLY)) < 0)
if (ENABLE_FEATURE_2_4_MODULES)
fd = open("/etc/conf.modules", O_RDONLY);
if (fd >= 0) { if (fd >= 0) {
include_conf(&first, &current, buffer, sizeof(buffer), fd); include_conf(&first, &current, buffer, sizeof(buffer), fd);