[openwrt/openwrt] octeon: ubnt-edgerouter: fix sysupgrade config backup/restore

LEDE Commits lede-commits at lists.infradead.org
Mon Sep 2 04:00:28 PDT 2024


robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/77037b09f3ce3284c8486b73cfaaceac53241990

commit 77037b09f3ce3284c8486b73cfaaceac53241990
Author: Jakob Haufe <sur5r at sur5r.net>
AuthorDate: Thu Aug 22 23:26:04 2024 +0200

    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.
    
    Signed-off-by: Jakob Haufe <sur5r at sur5r.net>
    Link: https://github.com/openwrt/openwrt/pull/16238
    Signed-off-by: Robert Marko <robimarko at gmail.com>
---
 target/linux/octeon/base-files/lib/preinit/79_move_config | 3 ++-
 target/linux/octeon/base-files/lib/upgrade/platform.sh    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

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




More information about the lede-commits mailing list