Ignore:
Timestamp:
Jan 1, 2014, 12:47:38 AM (7 years ago)
Author:
Bruno Cornec
Message:
  • Update mindi-busybox to 1.21.1
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi-busybox/modutils/modprobe-small.c

    r2725 r3232  
    99 */
    1010
    11 //applet:IF_MODPROBE_SMALL(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP))
    12 //applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
    13 //applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
    14 //applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
    15 //applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe))
     11//applet:IF_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP))
     12//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
     13//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
     14//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
     15//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, modprobe))
    1616
    1717#include "libbb.h"
     
    595595            goto ret;
    596596        }
    597         /* N.B. we do not stop here -
     597
     598        if (applet_name[0] == 'r') {
     599            /* rmmod: do not remove dependencies, exit */
     600            goto ret;
     601        }
     602
     603        /* modprobe -r: we do not stop here -
    598604         * continue to unload modules on which the module depends:
    599605         * "-r --remove: option causes modprobe to remove a module.
    600606         * If the modules it depends on are also unused, modprobe
    601          * will try to remove them, too." */
     607         * will try to remove them, too."
     608         */
    602609    }
    603610
     
    697704//usage:#if ENABLE_MODPROBE_SMALL
    698705
     706//// Note: currently, help system shows modprobe --help text for all aliased cmds
     707//// (see APPLET_ODDNAME macro definition).
     708//// All other help texts defined below are not used. FIXME?
     709
    699710//usage:#define depmod_trivial_usage NOUSAGE_STR
    700711//usage:#define depmod_full_usage ""
     
    712723//usage:       "Load the specified kernel modules into the kernel"
    713724//usage:    IF_FEATURE_2_4_MODULES( "\n"
    714 //usage:     "\nOptions:"
    715725//usage:     "\n    -f  Force module to load into the wrong kernel version"
    716726//usage:     "\n    -k  Make module autoclean-able"
     
    728738//usage:#define rmmod_full_usage "\n\n"
    729739//usage:       "Unload kernel modules\n"
    730 //usage:     "\nOptions:"
    731740//usage:     "\n    -w  Wait until the module is no longer used"
    732741//usage:     "\n    -f  Force unload"
     
    739748//usage:    "[-qfwrsv] MODULE [symbol=value]..."
    740749//usage:#define modprobe_full_usage "\n\n"
    741 //usage:       "Options:"
    742 //usage:     "\n    -r  Remove MODULE (stacks) or do autoclean"
     750//usage:       "    -r  Remove MODULE (stacks) or do autoclean"
    743751//usage:     "\n    -q  Quiet"
    744752//usage:     "\n    -v  Verbose"
     
    809817    /* only -q (quiet) and -r (rmmod),
    810818     * the rest are accepted and ignored (compat) */
    811     getopt32(argv, "qrfsvw");
     819    getopt32(argv, "qrfsvwb");
    812820    argv += optind;
    813821
Note: See TracChangeset for help on using the changeset viewer.