From: Rafał Miłecki <rafal@milecki.pl>
Date: Mon, 12 Feb 2024 10:56:57 +0000 (+0100)
Subject: base-files: sysupgrade: replace UMOUNT_ETCBACKUP_DIR with a local variable
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=57be93c16d45ac1db024375e7f4108f9baec553c;p=openwrt%2Fstaging%2Frmilecki.git

base-files: sysupgrade: replace UMOUNT_ETCBACKUP_DIR with a local variable

It was used inside do_save_conffiles() only.

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 e6ce3bd183c..b88b017ac04 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -24,7 +24,6 @@ export NEED_IMAGE=
 export HELP=0
 export FORCE=0
 export TEST=0
-export UMOUNT_ETCBACKUP_DIR=0
 
 # parse options
 while [ -n "$1" ]; do
@@ -225,6 +224,8 @@ include /lib/upgrade
 do_save_conffiles() {
 	local conf_tar="$1"
 
+	local umount_etcbackup_dir=0
+
 	[ "$(rootfs_type)" = "tmpfs" ] && {
 		echo "Cannot save config while running from ramdisk." >&2
 		ask_bool 0 "Abort" && exit
@@ -241,7 +242,7 @@ do_save_conffiles() {
 		RAMFS="$(mktemp -d -t sysupgrade.XXXXXX)"
 		mkdir -p "$RAMFS/upper" "$RAMFS/work"
 		mount -t overlay overlay -o lowerdir=$ETCBACKUP_DIR,upperdir=$RAMFS/upper,workdir=$RAMFS/work $ETCBACKUP_DIR &&
-			UMOUNT_ETCBACKUP_DIR=1 || {
+			umount_etcbackup_dir=1 || {
 				echo "Cannot mount '$ETCBACKUP_DIR' as tmpfs to avoid touching disk while saving the list of installed packages." >&2
 				ask_bool 0 "Abort" && exit
 			}
@@ -265,7 +266,7 @@ do_save_conffiles() {
 		rm -f "$conf_tar"
 	fi
 
-	[ "$UMOUNT_ETCBACKUP_DIR" -eq 1 ] && {
+	[ "$umount_etcbackup_dir" -eq 1 ] && {
 		umount "$ETCBACKUP_DIR"
 		rm -rf "$RAMFS"
 	}