svn commit: trunk/busybox/modutils

[vapier at busybox.net]

Author: vapier
Date: 2007-02-07 23:03:44 -0800 (Wed, 07 Feb 2007)
New Revision: 17811

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

Modified:
   trunk/busybox/modutils/modprobe.c


Changeset:
Modified: trunk/busybox/modutils/modprobe.c
===================================================================
--- trunk/busybox/modutils/modprobe.c	2007-02-08 06:30:58 UTC (rev 17810)
+++ trunk/busybox/modutils/modprobe.c	2007-02-08 07:03:44 UTC (rev 17811)
@@ -496,11 +496,15 @@
 	/*
 	 * 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);