From 143ddb6dc8bd7738400fd488d4925acad6167130 Mon Sep 17 00:00:00 2001
From: Mirko Vogt <mirko-openwrt@nanl.de>
Date: Wed, 10 Jul 2019 23:43:21 +0000
Subject: [PATCH] sysupgrade: abort if download / copy of sysupgrade image
fails
Before, sysupgrade attempted to initiate an upgrade, even though the
image download failed and/or was incomplete.
Signed-off-by: Mirko Vogt <mirko-openwrt@nanl.de>
---
package/base-files/files/sbin/sysupgrade | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 54d7a64b48..ffe28b5386 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -296,7 +296,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 $?
IMAGE=/tmp/sysupgrade.img
;;
esac
@@ -311,7 +311,7 @@ case "$IMAGE" in
/tmp/*) ;;
*)
v "Image not in /tmp, copying..."
- cp -f "$IMAGE" /tmp/sysupgrade.img
+ cp -f "$IMAGE" /tmp/sysupgrade.img || exit $?
IMAGE=/tmp/sysupgrade.img
;;
esac
--
2.20.1