diff options
| author | Robert Griebl | 2004-07-22 00:03:39 +0000 |
|---|---|---|
| committer | Robert Griebl | 2004-07-22 00:03:39 +0000 |
| commit | 36a836d5649e67506a8f0261c564e01651c21a26 (patch) | |
| tree | 6598849f8ebab5294512c8a631dbc00a7d686377 | |
| parent | 0177ce12562b119004028ad23edf09ea0b9ff14a (diff) | |
| download | busybox-36a836d5649e67506a8f0261c564e01651c21a26.zip busybox-36a836d5649e67506a8f0261c564e01651c21a26.tar.gz | |
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.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c index c584d8a..612e33a 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c @@ -275,9 +275,12 @@ static struct dep_t *build_dep ( void ) // alias parsing is not 100% correct (no correct handling of continuation lines within an alias) ! - if (( fd = open ( "/etc/modules.conf", O_RDONLY )) < 0 ) - if (( fd = open ( "/etc/conf.modules", O_RDONLY )) < 0 ) - return first; +#if defined(CONFIG_FEATURE_2_6_MODULES) + if (( fd = open ( "/etc/modprobe.conf", O_RDONLY )) < 0 ) +#endif + if (( fd = open ( "/etc/modules.conf", O_RDONLY )) < 0 ) + if (( fd = open ( "/etc/conf.modules", O_RDONLY )) < 0 ) + return first; continuation_line = 0; while ( reads ( fd, buffer, sizeof( buffer ))) { |