aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2003-06-20 09:57:30 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2003-06-20 09:57:30 +0000
commit9551f90d8ab85f8d4eefd739bef556635f735f68 (patch)
tree2f6964ffa656ba3dd203b83e25da8c74fb1cedf6
parente0b6dc7c7d7ecced4938d48d2aa8a909ebed4e97 (diff)
downloadbusybox-w32-9551f90d8ab85f8d4eefd739bef556635f735f68.tar.gz
busybox-w32-9551f90d8ab85f8d4eefd739bef556635f735f68.tar.bz2
busybox-w32-9551f90d8ab85f8d4eefd739bef556635f735f68.zip
Fall back to looking in /lib/modules/modules.dep if
/lib/modules/<kernel version>/modules.dep is missing git-svn-id: svn://busybox.net/trunk/busybox@6948 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--modutils/modprobe.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 13f17b869..b4bff5100 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -128,8 +128,13 @@ static struct dep_t *build_dep ( void )
128 strcat ( filename, un.release ); 128 strcat ( filename, un.release );
129 strcat ( filename, "/modules.dep" ); 129 strcat ( filename, "/modules.dep" );
130 130
131 if (( fd = open ( filename, O_RDONLY )) < 0 ) 131 if (( fd = open ( filename, O_RDONLY )) < 0 ) {
132 return 0; 132
133 /* Ok, that didn't work. Fall back to looking in /lib/modules */
134 if (( fd = open ( "/lib/modules/modules.dep", O_RDONLY )) < 0 ) {
135 return 0;
136 }
137 }
133 138
134 while ( reads ( fd, buffer, sizeof( buffer ))) { 139 while ( reads ( fd, buffer, sizeof( buffer ))) {
135 int l = bb_strlen ( buffer ); 140 int l = bb_strlen ( buffer );