From: Thibaut VARENE <hacks@slashdirt.org>
Date: Sat, 11 Feb 2017 10:10:37 +0000 (+0100)
Subject: ar71xx: fix platform_find_rootfspart()
X-Git-Tag: v18.06.0-rc1~3668
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=33154eaf41e8045def037ca037d8a29a2b3e8284;p=oweals%2Fopenwrt.git

ar71xx: fix platform_find_rootfspart()

platform_find_rootfspart() fails if the kernel partition comes before the
rootfs partition. The proposed patch fixes this while preserving what I
understand was the original idea: stop at first match.

Signed-off-by: Thibaut VARENE <hacks@slashdirt.org>
---

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index cf2aab2737..c87fbff75b 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -46,7 +46,7 @@ platform_find_kernelpart() {
 platform_find_rootfspart() {
 	local part
 	for part in "${1%:*}" "${1#*:}"; do
-		[ "$part" != "$2" ] && echo "$part"; break
+		[ "$part" != "$2" ] && echo "$part" && break
 	done
 }