[git commit] modprobe-small: fix "modprobe non-existing-module" exitcode (should be 1)

Denys Vlasenko vda.linux at googlemail.com
Thu Apr 6 11:45:00 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=0d6e3ad663adc327597f07fdcabd6ac545864d41
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 modutils/modprobe-small.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 0c0fe8d..1285783 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -765,9 +765,12 @@ static int process_module(char *name, const char *cmdline_options)
 
 	if (!infovec) {
 		/* both dirscan and find_alias found nothing */
-		if (!is_remove && !is_depmod) /* it wasn't rmmod or depmod */
+		if (!is_remove && !is_depmod) { /* it wasn't rmmod or depmod */
 			bb_error_msg("module '%s' not found", name);
 //TODO: _and_die()? or should we continue (un)loading modules listed on cmdline?
+			/* "modprobe non-existing-module; echo $?" must print 1 */
+			exitcode = EXIT_FAILURE;
+		}
 		goto ret;
 	}
 


More information about the busybox-cvs mailing list