fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: fix sysupgrade vars

Browse Source
This commit is contained in:
AmadeusGhost 2020-11-29 11:30:05 +08:00 committed by CN_SZTL
parent 8dbe7b1459
commit 25b0b5d3bf
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/layerscape/base-files/lib/upgrade/platform.sh
View File

@ -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
}

2
target/linux/mediatek/mt7622/base-files/lib/preinit/79_move_config
View File

@ -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
}

2
target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh
View File

@ -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
}

2
target/linux/mediatek/mt7623/base-files/lib/preinit/79_move_config
View File

@ -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
}

2
target/linux/mediatek/mt7623/base-files/lib/upgrade/platform.sh
View File

@ -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

8
target/linux/mvebu/cortexa9/base-files/lib/preinit/81_linksys_syscfg
View File

@ -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
}
;;

4
target/linux/rockchip/armv8/base-files/lib/preinit/79_move_config
View File

@ -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

2
target/linux/rockchip/armv8/base-files/lib/upgrade/platform.sh
View File

@ -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
}