aboutsummaryrefslogtreecommitdiff
path: root/modutils/modprobe.c
diff options
context:
space:
mode:
Diffstat (limited to 'modutils/modprobe.c')
-rw-r--r--modutils/modprobe.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index d48f36ed1..6b4405a44 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -57,6 +57,7 @@ struct mod_list_t {
57 57
58static struct dep_t *depend; 58static struct dep_t *depend;
59static int autoclean, show_only, quiet, do_syslog, verbose; 59static int autoclean, show_only, quiet, do_syslog, verbose;
60static int k_version;
60 61
61int parse_tag_value ( char *buffer, char **ptag, char **pvalue ) 62int parse_tag_value ( char *buffer, char **ptag, char **pvalue )
62{ 63{
@@ -116,6 +117,7 @@ static struct dep_t *build_dep ( void )
116 char *filename = buffer; 117 char *filename = buffer;
117 int continuation_line = 0; 118 int continuation_line = 0;
118 119
120 k_version = 0;
119 if ( uname ( &un )) 121 if ( uname ( &un ))
120 return 0; 122 return 0;
121 123
@@ -123,6 +125,9 @@ static struct dep_t *build_dep ( void )
123 if ( bb_strlen ( un.release ) > ( sizeof( buffer ) - 64 )) { 125 if ( bb_strlen ( un.release ) > ( sizeof( buffer ) - 64 )) {
124 return 0; 126 return 0;
125 } 127 }
128 if (un.release[0] == '2') {
129 k_version = un.release[2] - '0';
130 }
126 131
127 strcpy ( filename, "/lib/modules/" ); 132 strcpy ( filename, "/lib/modules/" );
128 strcat ( filename, un.release ); 133 strcat ( filename, un.release );
@@ -166,6 +171,12 @@ static struct dep_t *build_dep ( void )
166 else 171 else
167 mods++; 172 mods++;
168 173
174#if defined(CONFIG_FEATURE_2_6_MODULES)
175 if ((k_version > 4) && ( *(col-3) == '.' ) &&
176 ( *(col-2) == 'k' ) && ( *(col-1) == 'o' ))
177 ext = 3;
178 else
179#endif
169 if (( *(col-2) == '.' ) && ( *(col-1) == 'o' )) 180 if (( *(col-2) == '.' ) && ( *(col-1) == 'o' ))
170 ext = 2; 181 ext = 2;
171 182
@@ -215,6 +226,12 @@ static struct dep_t *build_dep ( void )
215 else 226 else
216 deps++; 227 deps++;
217 228
229#if defined(CONFIG_FEATURE_2_6_MODULES)
230 if ((k_version > 4) && ( *(end-2) == '.' ) && *(end-1) == 'k' &&
231 ( *end == 'o' ))
232 ext = 3;
233 else
234#endif
218 if (( *(end-1) == '.' ) && ( *end == 'o' )) 235 if (( *(end-1) == '.' ) && ( *end == 'o' ))
219 ext = 2; 236 ext = 2;
220 237
@@ -383,6 +400,13 @@ static void check_dep ( char *mod, struct mod_list_t **head, struct mod_list_t *
383 400
384 // remove .o extension 401 // remove .o extension
385 lm = bb_strlen ( mod ); 402 lm = bb_strlen ( mod );
403
404#if defined(CONFIG_FEATURE_2_6_MODULES)
405 if ((k_version > 4) && ( mod [lm-3] == '.' ) &&
406 ( mod [lm-2] == 'k' ) && ( mod [lm-1] == 'o' ))
407 mod [lm-3] = 0;
408 else
409#endif
386 if (( mod [lm-2] == '.' ) && ( mod [lm-1] == 'o' )) 410 if (( mod [lm-2] == '.' ) && ( mod [lm-1] == 'o' ))
387 mod [lm-2] = 0; 411 mod [lm-2] = 0;
388 412