Changeset 904 in MondoRescue for trunk/mindi-busybox/modutils

Timestamp:

Oct 25, 2006, 1:51:57 AM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r890:902 $SVN_M/branches/stable

Location:

trunk/mindi-busybox/modutils

Files:

• lsmod.c (modified) (2 diffs)
• modprobe.c (modified) (2 diffs)

trunk/mindi-busybox/modutils/lsmod.c

@@ -94 +94 @@
 
     module_names = xmalloc(bufsize = 256);
-    if (my_query_module(NULL, QM_MODULES, (void **)&module_names, &bufsize,
-                &nmod)) {
+    if (my_query_module(NULL, QM_MODULES, &module_names, &bufsize, &nmod)) {
         bb_perror_msg_and_die("QM_MODULES");
     }
@@ -112 +111 @@
             bb_perror_msg_and_die("module %s: QM_INFO", mn);
         }
-        if (my_query_module(mn, QM_REFS, (void **)&deps, &depsize, &count)) {
+        if (my_query_module(mn, QM_REFS, &deps, &depsize, &count)) {
             if (errno == ENOENT) {
                 /* The module was removed out from underneath us. */

trunk/mindi-busybox/modutils/modprobe.c

@@ -689 +689 @@
             if (!show_only) {
                 int rc2 = wait4pid(bb_spawn(argv));
-                
+
                 if (do_insert) {
                     rc = rc2; /* only last module matters */
@@ -838 +838 @@
 
         // 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