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

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>
This commit is contained in:
Rafał Miłecki
2019-09-04 16:57:39 +02:00
parent 1078de96e3
commit bf39047872
17 changed files with 37 additions and 28 deletions

View File

@@ -8,9 +8,9 @@ move_config() {
if export_bootdevice && export_partdevice partdev 1; then
mkdir -p /boot
if mount -o ro,noatime "/dev/$partdev" /boot; then
if [ -f /boot/sysupgrade.tgz ]; then
if [ -f "/boot/$BACKUP_FILE" ]; then
mount /boot -o remount,rw,noatime
mv -f /boot/sysupgrade.tgz /
mv -f "/boot/$BACKUP_FILE" /
fi
umount /boot
rm -fR /boot