aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modutils/modprobe.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index c584d8a61..612e33a9e 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -275,9 +275,12 @@ static struct dep_t *build_dep ( void )
275 275
276 // alias parsing is not 100% correct (no correct handling of continuation lines within an alias) ! 276 // alias parsing is not 100% correct (no correct handling of continuation lines within an alias) !
277 277
278 if (( fd = open ( "/etc/modules.conf", O_RDONLY )) < 0 ) 278#if defined(CONFIG_FEATURE_2_6_MODULES)
279 if (( fd = open ( "/etc/conf.modules", O_RDONLY )) < 0 ) 279 if (( fd = open ( "/etc/modprobe.conf", O_RDONLY )) < 0 )
280 return first; 280#endif
281 if (( fd = open ( "/etc/modules.conf", O_RDONLY )) < 0 )
282 if (( fd = open ( "/etc/conf.modules", O_RDONLY )) < 0 )
283 return first;
281 284
282 continuation_line = 0; 285 continuation_line = 0;
283 while ( reads ( fd, buffer, sizeof( buffer ))) { 286 while ( reads ( fd, buffer, sizeof( buffer ))) {