From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Tue, 26 Mar 2019 17:35:55 +0000 (+0200)
Subject: scripts/gen_image_generic.sh: fail on errors
X-Git-Tag: v19.07.0-rc1~916
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b422e1631eb810685db79dd25fa64e57a0917f25;p=openwrt%2Fopenwrt.git

scripts/gen_image_generic.sh: fail on errors

The script always exits with value 0, even if some of the commands fail.
This can potentially create broken, unbootable images, e.g. when
make_ext4fs fails due to TARGET_KERNEL_PARTSIZE being too small for the
kernel. Avoid this by failing the script when any command fails.

Acked-by: Jo-Philipp Wich <jo@mein.io>
Acked-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
---

diff --git a/scripts/gen_image_generic.sh b/scripts/gen_image_generic.sh
index 206ba7f3fa..d9beeb0295 100755
--- a/scripts/gen_image_generic.sh
+++ b/scripts/gen_image_generic.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Copyright (C) 2006-2012 OpenWrt.org
-set -x
+set -e -x
 [ $# == 5 -o $# == 6 ] || {
     echo "SYNTAX: $0 <file> <kernel size> <kernel directory> <rootfs size> <rootfs image> [<align>]"
     exit 1