From c58c31bf99749b644ff1a3851d361417ef204cc5 Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Sat, 4 Aug 2018 01:56:39 +0200 Subject: [PATCH] base-files: sysupgrade: abort if config backup fails Sysupgrade shouldn't proceed, if the backup of the configuration fails because tar (or gzip) exit with a non-zero code. Signed-off-by: Andreas Ziegler (backported from 72489ebeb65fd1e1d77e8d9fbe105827a98dbf03) --- package/base-files/Makefile | 2 +- package/base-files/files/sbin/sysupgrade | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 8775ffbc80..04a863a8c5 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:=193 +PKG_RELEASE:=194 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 2f579fb874..3637943117 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade @@ -166,6 +166,11 @@ do_save_conffiles() { v "Saving config files..." [ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V="" tar c${TAR_V}zf "$conf_tar" -T "$CONFFILES" 2>/dev/null + if [ "$?" -ne 0 ]; then + echo "Failed to create the configuration backup." + rm -f "$conf_tar" + exit 1 + fi rm -f "$CONFFILES" } -- 2.25.1