ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-18 16:40:29 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

base-files: sysupgrade: always cleanup after backups

Browse Source 
When tar was failing, it was exiting immediately. Some files and the
tmpfs mount (-k) would remain breaking the next backup attempt.

Also remove redundant $? from exit builtin call as exit already returns
the last command exit code when called.

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
This commit is contained in:
Luiz Angelo Daros de Luca 2022-10-19 23:27:52 -03:00 committed by Rafał Miłecki
parent 14ac91c68c
commit 700907bc63
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/base-files/files/sbin/sysupgrade
View File

@ -259,10 +259,10 @@ do_save_conffiles() {
[ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V="" [ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
sed -i -e 's,^/,,' "$CONFFILES" sed -i -e 's,^/,,' "$CONFFILES"
tar c${TAR_V}zf "$conf_tar" -C / -T "$CONFFILES" tar c${TAR_V}zf "$conf_tar" -C / -T "$CONFFILES"
if [ "$?" -ne 0 ]; then local err=$?
if [ "$err" -ne 0 ]; then
echo "Failed to create the configuration backup." echo "Failed to create the configuration backup."
rm -f "$conf_tar" rm -f "$conf_tar"
exit 1
fi fi
[ "$UMOUNT_ETCBACKUP_DIR" -eq 1 ] && { [ "$UMOUNT_ETCBACKUP_DIR" -eq 1 ] && {
@ -270,6 +270,8 @@ do_save_conffiles() {
rm -rf "$RAMFS" rm -rf "$RAMFS"
} }
rm -f "$CONFFILES" rm -f "$CONFFILES"
return "$err"
} }
if [ $CONF_BACKUP_LIST -eq 1 ]; then if [ $CONF_BACKUP_LIST -eq 1 ]; then
@ -282,7 +284,7 @@ fi
if [ -n "$CONF_BACKUP" ]; then if [ -n "$CONF_BACKUP" ]; then
do_save_conffiles "$CONF_BACKUP" do_save_conffiles "$CONF_BACKUP"
exit $? exit
fi fi
if [ -n "$CONF_RESTORE" ]; then if [ -n "$CONF_RESTORE" ]; then
@ -351,7 +353,7 @@ if [ -n "$CONF_IMAGE" ]; then
get_image "$CONF_IMAGE" "cat" > "$CONF_TAR" get_image "$CONF_IMAGE" "cat" > "$CONF_TAR"
export SAVE_CONFIG=1 export SAVE_CONFIG=1
elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then
[ $TEST -eq 1 ] || do_save_conffiles "$CONF_TAR" [ $TEST -eq 1 ] || do_save_conffiles "$CONF_TAR" || exit
export SAVE_CONFIG=1 export SAVE_CONFIG=1
else else
[ $TEST -eq 1 ] || rm -f "$CONF_TAR" [ $TEST -eq 1 ] || rm -f "$CONF_TAR"