ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-20 17:32:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
It was used inside do_save_conffiles() only.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki 2024-02-12 11:56:57 +01:00
parent 61ac147bb6
commit 57be93c16d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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