domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: don't hardcode "sysupgrade.tgz" file name

Browse Source 
1) Add BACKUP_FILE and use it when copying an archive to be restored
   after sysupgrade (on the next preinit).
2) Use CONF_TAR for copying backup prepared by the /sbin/sysupgrade

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit bf39047872)
This commit is contained in:
Rafał Miłecki
2019-09-04 16:57:39 +02:00
parent f54bc3985a
commit 37caec2d5e
15 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/files/lib/upgrade/nand.sh
View File

@@ -109,7 +109,7 @@ nand_restore_config() {
rmdir /tmp/new_root
return 1
fi
mv "$1" "/tmp/new_root/sysupgrade.tgz"
mv "$1" "/tmp/new_root/$BACKUP_FILE"
umount /tmp/new_root
sync
rmdir /tmp/new_root