From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Thu, 6 Apr 2017 11:45:00 +0000 (+0200)
Subject: modprobe-small: fix "modprobe non-existing-module" exitcode (should be 1)
X-Git-Tag: 1_27_0~87
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0d6e3ad663adc327597f07fdcabd6ac545864d41;p=oweals%2Fbusybox.git

modprobe-small: fix "modprobe non-existing-module" exitcode (should be 1)

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 0c0fe8d5d..1285783d0 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;
 	}