diff --git a/target/linux/layerscape/base-files/lib/upgrade/platform.sh b/target/linux/layerscape/base-files/lib/upgrade/platform.sh index e6c2767ed9..9c3d156c7f 100644 --- a/target/linux/layerscape/base-files/lib/upgrade/platform.sh +++ b/target/linux/layerscape/base-files/lib/upgrade/platform.sh @@ -60,7 +60,7 @@ platform_copy_config_sdboot() { if export_partdevice partdev 1; then mount -t $parttype -o rw,noatime "/dev/$partdev" /mnt 2>&1 echo "Saving config backup..." - cp -af "$CONF_TAR" "/mnt/$CONF_TAR" + cp -af "$CONF_TAR" "/mnt/sysupgrade.tgz" umount /mnt fi } diff --git a/target/linux/mediatek/mt7622/base-files/lib/preinit/79_move_config b/target/linux/mediatek/mt7622/base-files/lib/preinit/79_move_config index 0112a96929..1d1c4b831c 100644 --- a/target/linux/mediatek/mt7622/base-files/lib/preinit/79_move_config +++ b/target/linux/mediatek/mt7622/base-files/lib/preinit/79_move_config @@ -12,7 +12,7 @@ move_config() { insmod vfat mkdir -p /recovery mount -o rw,noatime $RECOVERY_PART /recovery - [ -f "/recovery/$CONF_TAR" ] && mv -f "/recovery/$CONF_TAR" / + [ -f "/recovery/sysupgrade.tgz" ] && mv -f "/recovery/sysupgrade.tgz" / umount /recovery fi } diff --git a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh index 5efea1bcef..b43001940c 100755 --- a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh @@ -40,7 +40,7 @@ platform_check_image() { platform_copy_config_emmc() { mkdir -p /recovery mount -o rw,noatime /dev/mmcblk0p6 /recovery - cp -af "$CONF_TAR" "/recovery/$CONF_TAR" + cp -af "$CONF_TAR" "/recovery/sysupgrade.tgz" sync umount /recovery } diff --git a/target/linux/mediatek/mt7623/base-files/lib/preinit/79_move_config b/target/linux/mediatek/mt7623/base-files/lib/preinit/79_move_config index fafeb32e49..3e1264ac79 100644 --- a/target/linux/mediatek/mt7623/base-files/lib/preinit/79_move_config +++ b/target/linux/mediatek/mt7623/base-files/lib/preinit/79_move_config @@ -28,7 +28,7 @@ move_config() { insmod vfat mkdir -p /recovery mount -o rw,noatime "/dev/$partdev" -t vfat /recovery - [ -f "/recovery/$CONF_TAR" ] && mv -f "/recovery/$CONF_TAR" / + [ -f "/recovery/sysupgrade.tgz" ] && mv -f "/recovery/sysupgrade.tgz" / umount /recovery fi } diff --git a/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh index bc27d4be5b..c3a9b81053 100755 --- a/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh @@ -188,7 +188,7 @@ platform_copy_config() { if [ -n "$recoverydev" ]; then mkdir -p /tmp/recovery mount -o rw,noatime "/dev/$recoverydev" -t vfat /tmp/recovery - cp -af "$CONF_TAR" "/tmp/recovery/$CONF_TAR" + cp -af "$CONF_TAR" "/tmp/recovery/sysupgrade.tgz" sync umount /tmp/recovery fi diff --git a/target/linux/mvebu/cortexa9/base-files/lib/preinit/81_linksys_syscfg b/target/linux/mvebu/cortexa9/base-files/lib/preinit/81_linksys_syscfg index 1cbb2738c2..dad73900b8 100644 --- a/target/linux/mvebu/cortexa9/base-files/lib/preinit/81_linksys_syscfg +++ b/target/linux/mvebu/cortexa9/base-files/lib/preinit/81_linksys_syscfg @@ -27,12 +27,12 @@ preinit_mount_syscfg() { fi mkdir /tmp/syscfg mount -t ubifs ubi1:syscfg /tmp/syscfg - [ -f "/tmp/syscfg/$CONF_TAR" ] && { + [ -f "/tmp/syscfg/sysupgrade.tgz" ] && { echo "- config restore -" cd / - mv "/tmp/syscfg/$CONF_TAR" /tmp - tar xzf "/tmp/$CONF_TAR" - rm -f "/tmp/$CONF_TAR" + mv "/tmp/syscfg/sysupgrade.tgz" /tmp + tar xzf "$CONF_TAR" + rm -f "$CONF_TAR" sync } ;; diff --git a/target/linux/rockchip/armv8/base-files/lib/preinit/79_move_config b/target/linux/rockchip/armv8/base-files/lib/preinit/79_move_config index 14d9281d4a..b900f33dd1 100644 --- a/target/linux/rockchip/armv8/base-files/lib/preinit/79_move_config +++ b/target/linux/rockchip/armv8/base-files/lib/preinit/79_move_config @@ -5,8 +5,8 @@ move_config() { if export_bootdevice && export_partdevice partdev 1; then if mount -o rw,noatime "/dev/$partdev" /mnt; then - if [ -f "/mnt/$CONF_TAR" ]; then - mv -f "/mnt/$CONF_TAR" / + if [ -f "/mnt/sysupgrade.tgz" ]; then + mv -f "/mnt/sysupgrade.tgz" / fi umount /mnt fi diff --git a/target/linux/rockchip/armv8/base-files/lib/upgrade/platform.sh b/target/linux/rockchip/armv8/base-files/lib/upgrade/platform.sh index a1d1e04ae7..3177892171 100644 --- a/target/linux/rockchip/armv8/base-files/lib/upgrade/platform.sh +++ b/target/linux/rockchip/armv8/base-files/lib/upgrade/platform.sh @@ -30,7 +30,7 @@ platform_copy_config() { if export_partdevice partdev 1; then mount -o rw,noatime "/dev/$partdev" /mnt - cp -af "$CONF_TAR" "/mnt/$CONF_TAR" + cp -af "$CONF_TAR" "/mnt/sysupgrade.tgz" umount /mnt fi }