aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/armsr/base-files/lib/upgrade
diff options
context:
space:
mode:
authorChristian Buschau <cbuschau@d00t.de>2023-10-17 14:51:53 +0200
committerChristian Buschau <cbuschau@d00t.de>2023-10-20 00:41:41 +0200
commitc0c4a9bce42bea74fa9fa984cde149eac5e479bf (patch)
tree9fa5dd56c1c573abd076f67a0c32757b00d954bf /target/linux/armsr/base-files/lib/upgrade
parent72f7f18d2ba160f371c027ba4a60e82e19248340 (diff)
downloadupstream-c0c4a9bce42bea74fa9fa984cde149eac5e479bf.tar.gz
upstream-c0c4a9bce42bea74fa9fa984cde149eac5e479bf.tar.bz2
upstream-c0c4a9bce42bea74fa9fa984cde149eac5e479bf.zip
armsr: preserve configuration during sysupgrade
Copy configuration to boot partition (partition 1) instead of root partition (partition 2) because the root partition is not writable if it's a suqashfs image. Move configuration back to root during preinit. Fixes: https://github.com/openwrt/openwrt/issues/13695 Signed-off-by: Christian Buschau <cbuschau@d00t.de> (cherry picked from commit 67ce60c5f961c4248fa108cd0f949e2bade4536e)
Diffstat (limited to 'target/linux/armsr/base-files/lib/upgrade')
-rw-r--r--target/linux/armsr/base-files/lib/upgrade/platform.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/armsr/base-files/lib/upgrade/platform.sh b/target/linux/armsr/base-files/lib/upgrade/platform.sh
index 8263b9c7e3..e72c6955e5 100644
--- a/target/linux/armsr/base-files/lib/upgrade/platform.sh
+++ b/target/linux/armsr/base-files/lib/upgrade/platform.sh
@@ -36,7 +36,8 @@ platform_check_image() {
platform_copy_config() {
local partdev parttype=ext4
- if export_partdevice partdev 2; then
+ if export_partdevice partdev 1; then
+ part_magic_fat "/dev/$partdev" && parttype=vfat
mount -t $parttype -o rw,noatime "/dev/$partdev" /mnt
cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
umount /mnt