diff options
| author | Petr Štetiar <ynezz@true.cz> | 2019-12-31 10:34:29 +0100 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-01-05 17:50:10 +0100 |
| commit | bf99f7920012a1b45e9e6d094e9ac1bcd1f7d931 (patch) | |
| tree | b4236659662d838e994498bd3f6b91ed19494796 | |
| parent | 3140d380422e3b6416b5dbdc951f90b006a4eaac (diff) | |
| download | upstream-bf99f7920012a1b45e9e6d094e9ac1bcd1f7d931.tar.gz upstream-bf99f7920012a1b45e9e6d094e9ac1bcd1f7d931.tar.bz2 upstream-bf99f7920012a1b45e9e6d094e9ac1bcd1f7d931.zip | |
base-files: sysupgrade: exit if the firmware download failed
Sysupgrade process shouldn't continue if the firmware image couldn't be
downloaded.
Ref: http://lists.infradead.org/pipermail/openwrt-devel/2019-December/020940.html
Reported-by: Petr Novák <petrn@me.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit cf3da66d2ce11a30ae2993b56276ade10c9bddb9)
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/sysupgrade | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 3602cc003f..c30694cfdd 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=204.1 +PKG_RELEASE:=204.2 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index 935d08048e..6c518b780e 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -294,7 +294,7 @@ type platform_check_image >/dev/null 2>/dev/null || { case "$IMAGE" in http://*|\ https://*) - wget -O/tmp/sysupgrade.img "$IMAGE" + wget -O/tmp/sysupgrade.img "$IMAGE" || exit 1 IMAGE=/tmp/sysupgrade.img ;; esac |