[OpenWrt-Devel] [PATCH 1/1] ipq40xx: Linksys: sysupgrade: Ensure OEM volumes are removed

[Jeff Kletsky]

From: Jeff Kletsky <git-commits at allycomm.com>

When OEM volumes are present in the [alt_]firmware partition,
sysupgrade will write a new kernel, but will fail to write
the root file system. The next boot will hang indefinitely

    Waiting for root device /dev/ubiblock0_0...

Modified ipq40xx/base-files/lib/upgrade/linksys.sh
to remove both `squashfs` and `ubifs` if found
on the target firmware partition's UBI device.

Run-tested-on: Linksys EA8300

Signed-off-by: Jeff Kletsky <git-commits at allycomm.com>
---
 .../ipq40xx/base-files/lib/upgrade/linksys.sh | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh b/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh
index b8e6dd7352..a6cf5d8de9 100755
--- a/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 linksys_get_target_firmware() {
 
 	local cur_boot_part mtd_ubi0
@@ -53,8 +55,12 @@ linksys_get_root_magic() {
 }
 
 platform_do_upgrade_linksys() {
+
 	local magic_long="$(get_magic_long "$1")"
 
+	local rm_oem_fw_vols="squashfs ubifs"	# from OEM [alt_]rootfs UBI
+	local vol
+
 	mkdir -p /var/lock
 	local part_label="$(linksys_get_target_firmware)"
 	touch /var/lock/fw_printenv.lock
@@ -64,7 +70,7 @@ platform_do_upgrade_linksys() {
 		exit 1
 	fi
 
-	local target_mtd=$(find_mtd_part $part_label)
+	local target_mtd=$(find_mtd_part "$part_label")
 
 	[ "$magic_long" = "73797375" ] && {
 		CI_KERNPART="$part_label"
@@ -74,8 +80,6 @@ platform_do_upgrade_linksys() {
 			CI_UBIPART="alt_rootfs"
 		fi
 
-		# remove "squashfs" vol (in case we are flashing over a stock image, which is also UBI)
-
 		local mtdnum="$( find_mtd_index "$CI_UBIPART" )"
 		if [ ! "$mtdnum" ]; then
 			echo "cannot find ubi mtd partition $CI_UBIPART"
@@ -89,15 +93,14 @@ platform_do_upgrade_linksys() {
 			ubidev="$( nand_find_ubi "$CI_UBIPART" )"
 		fi
 
-		if [ "$ubidev" ]; then
-			local squash_ubivol="$( nand_find_volume $ubidev squashfs )"
-			# kill volume
-			[ "$squash_ubivol" ] && ubirmvol /dev/$ubidev -N squashfs || true
-		fi
+		[ "$ubidev" ] && for vol in $rm_oem_fw_vols ; do
+			ubirmvol "/dev/$ubidev" -N "$vol" 2>/dev/null
+		done
 
 		# complete std upgrade
 		nand_upgrade_tar "$1"
 	}
+
 	[ "$magic_long" = "27051956" ] && {
 		# This magic is for a uImage (which is a sysupgrade image)
 		# check firmwares' rootfs types
@@ -107,7 +110,8 @@ platform_do_upgrade_linksys() {
 		if [ "$newroot" = "55424923" -a "$oldroot" = "55424923" ]; then
 			# we're upgrading from a firmware with UBI to one with UBI
 			# erase everything to be safe
-			# - Is that really needed? Won't remove (or comment) the if, because it may be needed in a future device.
+			# - Is that really needed? Won't remove (or comment) the if,
+			#   because it may be needed in a future device.
 			#mtd erase $part_label
 			#get_image "$1" | mtd -n write - $part_label
 			echo "writing \"$1\" UBI image to \"$part_label\" (UBI)..."
-- 
2.20.1


_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel