emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch from Andrew Dennison:

Browse Source 
I've had some issues with modprobe which I reported a few months ago. This
is still an issue so I decided to sort it out.

The attached diff includes the changes against the unstable cvs tree that
work for me.

Changes are:
mod_process() will report success if the module at the head of the list
loads successfully. It will also report success if any module unloads
successfully.
The net result being that modprobe will succeed in the cases outlined below.
I've also added error reporting to modprobe -r. Previously it would silently
fail (but report success) if the module could not be unloaded.

Andrew
This commit is contained in:
Eric Andersen 2003-06-20 09:56:37 +00:00
parent 9d7f0f0fe8
commit 908e362133
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
modutils/modprobe.c
View File

@ -3,6 +3,7 @@
* Modprobe written from scratch for BusyBox * Modprobe written from scratch for BusyBox
* *
* Copyright (c) 2002 by Robert Griebl, griebl@gmx.de * Copyright (c) 2002 by Robert Griebl, griebl@gmx.de
* Copyright (c) 2003 by Andrew Dennison, andrew.dennison@motec.com.au
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -317,10 +318,7 @@ static struct dep_t *build_dep ( void )
static int mod_process ( struct mod_list_t *list, int do_insert ) static int mod_process ( struct mod_list_t *list, int do_insert )
{ {
char lcmd [256]; char lcmd [256];
int rc = 0; int rc = 1;
if ( !list )
return 1;
while ( list ) { while ( list ) {
if ( do_insert ) if ( do_insert )
@ -330,12 +328,15 @@ static int mod_process ( struct mod_list_t *list, int do_insert )
if ( verbose ) if ( verbose )
printf ( "%s\n", lcmd ); printf ( "%s\n", lcmd );
if ( !show_only ) if ( !show_only ) {
rc |= system ( lcmd ); int rc2 = system ( lcmd );
if (do_insert) rc = rc2; /* only last module matters */
else if (!rc2) rc = 0; /* success if remove any mod */
}
list = do_insert ? list-> m_prev : list-> m_next; list = do_insert ? list-> m_prev : list-> m_next;
} }
return rc; return (show_only) ? 0 : rc;
} }
static void check_dep ( char *mod, struct mod_list_t **head, struct mod_list_t **tail ) static void check_dep ( char *mod, struct mod_list_t **head, struct mod_list_t **tail )
@ -429,7 +430,7 @@ static int mod_insert ( char *mod, int argc, char **argv )
{ {
struct mod_list_t *tail = 0; struct mod_list_t *tail = 0;
struct mod_list_t *head = 0; struct mod_list_t *head = 0;
int rc = 0; int rc;
// get dep list for module mod // get dep list for module mod
check_dep ( mod, &head, &tail ); check_dep ( mod, &head, &tail );
@ -453,7 +454,7 @@ static int mod_insert ( char *mod, int argc, char **argv )
} }
// process tail ---> head // process tail ---> head
rc |= mod_process ( tail, 1 ); rc = mod_process ( tail, 1 );
} }
else else
rc = 1; rc = 1;
@ -461,8 +462,9 @@ static int mod_insert ( char *mod, int argc, char **argv )
return rc; return rc;
} }
static void mod_remove ( char *mod ) static int mod_remove ( char *mod )
{ {
int rc;
static struct mod_list_t rm_a_dummy = { "-a", 0, 0 }; static struct mod_list_t rm_a_dummy = { "-a", 0, 0 };
struct mod_list_t *head = 0; struct mod_list_t *head = 0;
@ -474,7 +476,11 @@ static void mod_remove ( char *mod )
head = tail = &rm_a_dummy; head = tail = &rm_a_dummy;
if ( head && tail ) if ( head && tail )
mod_process ( head, 0 ); // process head ---> tail rc = mod_process ( head, 0 ); // process head ---> tail
else
rc = 1;
return rc;
} }
@ -530,11 +536,17 @@ extern int modprobe_main(int argc, char** argv)
bb_error_msg_and_die ( "could not parse modules.dep\n" ); bb_error_msg_and_die ( "could not parse modules.dep\n" );
if (remove_opt) { if (remove_opt) {
int rc = EXIT_SUCCESS;
do { do {
mod_remove ( optind < argc ? bb_xstrdup ( argv [optind] ) : NULL ); if (mod_remove ( optind < argc ?
bb_xstrdup (argv [optind]) : NULL )) {
bb_error_msg ("failed to remove module %s",
argv [optind] );
rc = EXIT_FAILURE;
}
} while ( ++optind < argc ); } while ( ++optind < argc );
return EXIT_SUCCESS; return rc;
} }
if (optind >= argc) if (optind >= argc)