summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Haufe2024-08-22 21:26:04 +0000
committerHauke Mehrtens2024-09-28 16:33:21 +0000
commitfa0a7e00e8297d3014928a2b502a634704eafc1c (patch)
tree7a6d636d87059284eee42ca6c3bcb0dc44cd1e12
parent87477c756e1136ee338a9fd67e0df81f853f74d4 (diff)
downloadopenwrt-fa0a7e00e8297d3014928a2b502a634704eafc1c.tar.gz
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 <sur5r@sur5r.net> Link: https://github.com/openwrt/openwrt/pull/16518 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--target/linux/octeon/base-files/lib/preinit/79_move_config3
-rwxr-xr-xtarget/linux/octeon/base-files/lib/upgrade/platform.sh1
2 files changed, 3 insertions, 1 deletions
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