aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Griebl <griebl@gmx.de>2004-07-22 00:03:39 +0000
committerRobert Griebl <griebl@gmx.de>2004-07-22 00:03:39 +0000
commit36a836d5649e67506a8f0261c564e01651c21a26 (patch)
tree6598849f8ebab5294512c8a631dbc00a7d686377
parent0177ce12562b119004028ad23edf09ea0b9ff14a (diff)
downloadbusybox-w32-36a836d5649e67506a8f0261c564e01651c21a26.tar.gz
busybox-w32-36a836d5649e67506a8f0261c564e01651c21a26.tar.bz2
busybox-w32-36a836d5649e67506a8f0261c564e01651c21a26.zip
Patch from Mike Snitzer <snitzer@gmail.com>:
Support for /etc/modprobe.conf (for 2.6 kernels) should likely be added to bb's modprobe, see attached patch. modprobe.conf is just a (even simpler) variant of modules.conf
-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 ))) {