diff options
author | Ron Yorston <rmy@pobox.com> | 2012-10-10 12:56:24 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-10-10 12:56:24 +0100 |
commit | 981a6fcd1323a77d5829c7d574bb40fd1b96dc4d (patch) | |
tree | a1e3aadf4de65d7a525c7dd6172546ff577777d5 /modutils | |
parent | 19436cc0ee509a5e356c04f0026919abd417bec4 (diff) | |
parent | eab343e7e1e5331df833aa69f14584e4a6c738f1 (diff) | |
download | busybox-w32-981a6fcd1323a77d5829c7d574bb40fd1b96dc4d.tar.gz busybox-w32-981a6fcd1323a77d5829c7d574bb40fd1b96dc4d.tar.bz2 busybox-w32-981a6fcd1323a77d5829c7d574bb40fd1b96dc4d.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'modutils')
-rw-r--r-- | modutils/modprobe-small.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c index bd855f628..5b7836344 100644 --- a/modutils/modprobe-small.c +++ b/modutils/modprobe-small.c | |||
@@ -594,11 +594,18 @@ static void process_module(char *name, const char *cmdline_options) | |||
594 | bb_perror_msg("remove '%s'", name); | 594 | bb_perror_msg("remove '%s'", name); |
595 | goto ret; | 595 | goto ret; |
596 | } | 596 | } |
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 - | ||
598 | * continue to unload modules on which the module depends: | 604 | * continue to unload modules on which the module depends: |
599 | * "-r --remove: option causes modprobe to remove a module. | 605 | * "-r --remove: option causes modprobe to remove a module. |
600 | * If the modules it depends on are also unused, modprobe | 606 | * 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 | */ | ||
602 | } | 609 | } |
603 | 610 | ||
604 | if (!info) { | 611 | if (!info) { |