From: Michal Hrusecky <michal.hrusecky@nic.cz>
Date: Thu, 25 Oct 2018 10:53:02 +0000 (+0200)
Subject: mtd: Fail when verify fails
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=58f334366c1d9b79a6110bafc4698457a4be3d7a;p=openwrt%2Fstaging%2Fchunkeey.git

mtd: Fail when verify fails

Return non-zero exit code when mtd verify fails.

Signed-off-by: Michal Hrusecky <michal.hrusecky@nic.cz>
---

diff --git a/package/system/mtd/src/mtd.c b/package/system/mtd/src/mtd.c
index 9baed3fd5e..99851c517b 100644
--- a/package/system/mtd/src/mtd.c
+++ b/package/system/mtd/src/mtd.c
@@ -848,7 +848,7 @@ static void do_reboot(void)
 
 int main (int argc, char **argv)
 {
-	int ch, i, boot, imagefd = 0, force, unlocked;
+	int ch, i, boot, imagefd = 0, force, unlocked, ret = 0;
 	char *erase[MAX_ARGS], *device = NULL;
 	char *fis_layout = NULL;
 	size_t offset = 0, data_size = 0, part_offset = 0, dump_len = 0;
@@ -1046,7 +1046,7 @@ int main (int argc, char **argv)
 				mtd_unlock(device);
 			break;
 		case CMD_VERIFY:
-			mtd_verify(device, imagefile);
+			ret |= mtd_verify(device, imagefile);
 			break;
 		case CMD_DUMP:
 			mtd_dump(device, offset, dump_len);
@@ -1095,5 +1095,5 @@ int main (int argc, char **argv)
 	if (boot)
 		do_reboot();
 
-	return 0;
+	return ret;
 }