aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorAndreas Ziegler <dev@andreas-ziegler.de>2018-08-04 01:56:39 +0200
committerJohn Crispin <john@phrozen.org>2018-08-06 06:51:44 +0200
commit72489ebeb65fd1e1d77e8d9fbe105827a98dbf03 (patch)
tree0e52a3e4d9a468857c9921a085f86f5e3d0f3c92 /package
parenta692e4e3de60e1a10906511fb8ef2d14937d4a19 (diff)
downloadupstream-72489ebeb65fd1e1d77e8d9fbe105827a98dbf03.tar.gz
upstream-72489ebeb65fd1e1d77e8d9fbe105827a98dbf03.tar.bz2
upstream-72489ebeb65fd1e1d77e8d9fbe105827a98dbf03.zip
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 <dev@andreas-ziegler.de>
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/sbin/sysupgrade5
2 files changed, 6 insertions, 1 deletions
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 a378b02950..c9615e54c3 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -165,6 +165,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"
}