[OpenWrt-Devel,v5,1/2] Evaluate board names in alphabetical order

Message ID 20181206152536.38850-2-jonathan@navigue.com
State Under Review
Delegated to: John Crispin
Headers show
Series
  • Allow sysupgrade restore on ER
Related show

Commit Message

Jonathan Thibault Dec. 6, 2018, 3:25 p.m.
---
 target/linux/octeon/base-files/lib/upgrade/platform.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/target/linux/octeon/base-files/lib/upgrade/platform.sh b/target/linux/octeon/base-files/lib/upgrade/platform.sh
index cd49c0da36..6d258dbb0f 100755
--- a/target/linux/octeon/base-files/lib/upgrade/platform.sh
+++ b/target/linux/octeon/base-files/lib/upgrade/platform.sh
@@ -62,12 +62,12 @@  platform_do_upgrade() {
 
 	[ -b "${rootfs}" ] || return 1
 	case "$board" in
-	erlite)
-		kernel=sda1
-		;;
 	er)
 		kernel=mmcblk0p1
 		;;
+	erlite)
+		kernel=sda1
+		;;
 	*)
 		return 1
 	esac
@@ -82,8 +82,8 @@  platform_check_image() {
 	local board=$(board_name)
 
 	case "$board" in
-	erlite | \
-	er)
+	er | \
+	erlite)
 		local tar_file="$1"
 		local kernel_length=`(tar xf $tar_file sysupgrade-$board/kernel -O | wc -c) 2> /dev/null`
 		local rootfs_length=`(tar xf $tar_file sysupgrade-$board/root -O | wc -c) 2> /dev/null`