From: Jakob Haufe Date: Thu, 22 Aug 2024 21:26:04 +0000 (+0200) Subject: octeon: ubnt-edgerouter: fix sysupgrade config backup/restore X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=fa0a7e00e8297d3014928a2b502a634704eafc1c;p=openwrt%2Fstaging%2Fpepe2k.git octeon: ubnt-edgerouter: fix sysupgrade config backup/restore er is missing from platform_copy_config() and octeon_move_config(), so config is lost on every sysupgrade. (cherry-picked from commit 77037b09f3ce3284c8486b73cfaaceac53241990) Signed-off-by: Jakob Haufe Link: https://github.com/openwrt/openwrt/pull/16518 Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/octeon/base-files/lib/preinit/79_move_config b/target/linux/octeon/base-files/lib/preinit/79_move_config index 01491500a0..e81627aaf2 100644 --- a/target/linux/octeon/base-files/lib/preinit/79_move_config +++ b/target/linux/octeon/base-files/lib/preinit/79_move_config @@ -22,7 +22,8 @@ octeon_move_config() { itus,shield-router) move_config "/dev/mmcblk1p1" ;; - ubnt,edgerouter-4 | \ + er|\ + ubnt,edgerouter-4|\ ubnt,edgerouter-6p) move_config "/dev/mmcblk0p1" ;; diff --git a/target/linux/octeon/base-files/lib/upgrade/platform.sh b/target/linux/octeon/base-files/lib/upgrade/platform.sh index 14b3eefe7e..0b018890c5 100755 --- a/target/linux/octeon/base-files/lib/upgrade/platform.sh +++ b/target/linux/octeon/base-files/lib/upgrade/platform.sh @@ -34,6 +34,7 @@ platform_copy_config() { itus,shield-router) platform_copy_config_helper /dev/mmcblk1p1 ;; + er|\ ubnt,edgerouter-4|\ ubnt,edgerouter-6p) platform_copy_config_helper /dev/mmcblk0p1