Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-21 23:29:34 +00:00
Code Issues Projects Releases Wiki Activity

Patch from Yann Morin so modprobe won't return failure if the module gets

Browse Source 
loaded while it's running (ala multi-device hotplug).
This commit is contained in:
Rob Landley 2006-08-22 23:50:11 +00:00
parent ecb29573e9
commit 4b5827a69b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modutils/modprobe.c
View File

@ -679,7 +679,7 @@ static int mod_process ( struct mod_list_t *list, int do_insert )
} }
if (!show_only) { if (!show_only) {
int rc2 = wait4pid(spawn(argv)); int rc2 = wait4pid(spawn(argv));
if (do_insert) { if (do_insert) {
rc = rc2; /* only last module matters */ rc = rc2; /* only last module matters */
} }
@ -859,7 +859,16 @@ static int mod_insert ( char *mod, int argc, char **argv )
} }
// process tail ---> head // process tail ---> head
rc = mod_process ( tail, 1 ); if ((rc = mod_process ( tail, 1 )) != 0) {
/*
* In case of using udev, multiple instances of modprobe can be
* spawned to load the same module (think of two same usb devices,
* for example; or cold-plugging at boot time). Thus we shouldn't
* fail if the module was loaded, and not by us.
*/
if (already_loaded (mod) )
rc = 0;
}
} }
else else
rc = 1; rc = 1;