Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/modutils/modprobe-small.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/modutils/modprobe-small.c (modified) (7 diffs)

branches/3.2/mindi-busybox/modutils/modprobe-small.c

@@ -9 +9 @@
  */
 
-//applet:IF_MODPROBE_SMALL(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP))
-//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
-//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
-//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
-//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
+//applet:IF_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
+//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
+//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
+//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
 
 #include "libbb.h"
@@ -595 +595 @@
             goto ret;
         }
-        /* N.B. we do not stop here -
+
+        if (applet_name[0] == 'r') {
+            /* rmmod: do not remove dependencies, exit */
+            goto ret;
+        }
+
+        /* modprobe -r: we do not stop here -
          * continue to unload modules on which the module depends:
          * "-r --remove: option causes modprobe to remove a module.
          * If the modules it depends on are also unused, modprobe
-         * will try to remove them, too." */
+         * will try to remove them, too."
+         */
     }
 
@@ -697 +704 @@
 //usage:#if ENABLE_MODPROBE_SMALL
 
+//// Note: currently, help system shows modprobe --help text for all aliased cmds
+//// (see APPLET_ODDNAME macro definition).
+//// All other help texts defined below are not used. FIXME?
+
 //usage:#define depmod_trivial_usage NOUSAGE_STR
 //usage:#define depmod_full_usage ""
@@ -712 +723 @@
 //usage:       "Load the specified kernel modules into the kernel"
 //usage:    IF_FEATURE_2_4_MODULES( "\n"
-//usage:     "\nOptions:"
 //usage:     "\n    -f  Force module to load into the wrong kernel version"
 //usage:     "\n    -k  Make module autoclean-able"
@@ -728 +738 @@
 //usage:#define rmmod_full_usage "\n\n"
 //usage:       "Unload kernel modules\n"
-//usage:     "\nOptions:"
 //usage:     "\n    -w  Wait until the module is no longer used"
 //usage:     "\n    -f  Force unload"
@@ -739 +748 @@
 //usage:    "[-qfwrsv] MODULE [symbol=value]..."
 //usage:#define modprobe_full_usage "\n\n"
-//usage:       "Options:"
-//usage:     "\n    -r  Remove MODULE (stacks) or do autoclean"
+//usage:       "    -r  Remove MODULE (stacks) or do autoclean"
 //usage:     "\n    -q  Quiet"
 //usage:     "\n    -v  Verbose"
@@ -809 +817 @@
     /* only -q (quiet) and -r (rmmod),
      * the rest are accepted and ignored (compat) */
-    getopt32(argv, "qrfsvw");
+    getopt32(argv, "qrfsvwb");
     argv += optind;