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 <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/16518
Signed-off-by: Hauke Mehrtens <[email protected]>

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 01491500a03ee7563ce3020367fbd1faa81f90f9..e81627aaf20f9f67a68477256537ac289aea7ad4 100644 (file)
--- 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 14b3eefe7e68851a3651f21c3a6702659343c7bb..0b018890c5f9bca4991678fe9db8103fbb6fa327 100755 (executable)
--- 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