diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2012-09-25 20:37:38 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2012-09-25 20:37:38 +0200 |
| commit | 06a98e32ae930a4e332281b42b6bb769dcadc04e (patch) | |
| tree | e90faeb33d9e0f3affa8766ba652f8a17779c344 /modutils | |
| parent | 0b4980c2527552594d4f540ebc6e6cfb398895b3 (diff) | |
| download | busybox-06a98e32ae930a4e332281b42b6bb769dcadc04e.tar.gz | |
modprobe_small: make rmmod to NOT remove dependencies. Closes 5162
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
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) bb_perror_msg("remove '%s'", name); 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." + */ } if (!info) { |