From: Rafał Miłecki <rafal@milecki.pl>
Date: Mon, 12 Feb 2024 10:57:00 +0000 (+0100)
Subject: base-files: sysupgrade: s/do_save_conffiles/create_backup_archive/
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4a1b94adba1a1de0e388c58508b2d78bd788729b;p=openwrt%2Fstaging%2Fsvanheule.git

base-files: sysupgrade: s/do_save_conffiles/create_backup_archive/

Rename function to more accurate and self-explanatory name:
1. Use "archive" in name as this functions creates tar archive
2. Avoid "conffiles" as this function may archive more than that

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 592b1f3781..73d45fd03d 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -234,7 +234,7 @@ fi
 
 include /lib/upgrade
 
-do_save_conffiles() {
+create_backup_archive() {
 	local conf_tar="$1"
 
 	local umount_etcbackup_dir=0
@@ -297,7 +297,7 @@ if [ $CONF_BACKUP_LIST -eq 1 ]; then
 fi
 
 if [ -n "$CONF_BACKUP" ]; then
-	do_save_conffiles "$CONF_BACKUP"
+	create_backup_archive "$CONF_BACKUP"
 	exit
 fi
 
@@ -367,7 +367,7 @@ if [ -n "$CONF_IMAGE" ]; then
 	get_image "$CONF_IMAGE" "cat" > "$CONF_TAR"
 	export SAVE_CONFIG=1
 elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then
-	[ $TEST -eq 1 ] || do_save_conffiles "$CONF_TAR" || exit
+	[ $TEST -eq 1 ] || create_backup_archive "$CONF_TAR" || exit
 	export SAVE_CONFIG=1
 else
 	[ $TEST -eq 1 ] || rm -f "$CONF_TAR"