[OpenWrt-Devel,1/1] ipq40xx: Linksys: sysupgrade: Ensure OEM volumes are removed
diff mbox series

Message ID 20190615214056.11729-2-lede@allycomm.com
State Accepted, archived
Delegated to: Christian Lamparter
Headers show
Series
  • ipq40xx: Linksys: sysupgrade: Ensure OEM volumes are removed
Related show

Commit Message

Jeff Kletsky June 15, 2019, 9:40 p.m. UTC
From: Jeff Kletsky <git-commits@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@allycomm.com>
---
 .../ipq40xx/base-files/lib/upgrade/linksys.sh | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

Comments

Christian Lamparter June 16, 2019, 11:49 a.m. UTC | #1
On Saturday, June 15, 2019 11:40:56 PM CEST Jeff Kletsky wrote:
> From: Jeff Kletsky <git-commits@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@allycomm.com>

Can you check if this is still working? Or if I broke it
when I was implementing the shellcheck changes?

https://git.openwrt.org/?p=openwrt/staging/chunkeey.git;a=commit;h=003c63f7b1102702fb4a0580683b21ded1ee1a3e

Cheers,
Christian

> ---
>  .../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)..."
>
Jeff Kletsky June 16, 2019, 3:20 p.m. UTC | #2
On 6/16/19 4:49 AM, Christian Lamparter wrote:

> On Saturday, June 15, 2019 11:40:56 PM CEST Jeff Kletsky wrote:
>> From: Jeff Kletsky <git-commits@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@allycomm.com>
> Can you check if this is still working? Or if I broke it
> when I was implementing the shellcheck changes?
>
> https://git.openwrt.org/?p=openwrt/staging/chunkeey.git;a=commit;h=003c63f7b1102702fb4a0580683b21ded1ee1a3e
>
> Cheers,
> Christian
>
> [...]

With the caveat that I don't know how to exercise the
[ "$magic_long" = "27051956" ] branch of the code[1],
your referenced commit from staging/chunkeey is able to
sysupgrade my ipq4019-based EA8300 both over OpenWrt
as well as over OEM. I have also spot-checked the
"missing boot_part" path.

Thanks for the quick review of the changes as well as
the clean-up of existing code.

Jeff


---

[1] EA8300 "factory" images don't match the "other" branch

$ hexdump -C -n 128 ~/devel/ea8300/FW_EA8300_1.1.4.191539_prod.img
00000000  d0 0d fe ed 00 27 72 7c  00 00 00 38 00 27 6e a8  |.....'r|...8.'n.|
00000010  00 00 00 28 00 00 00 11  00 00 00 10 00 00 00 00  |...(............|
00000020  00 00 00 6c 00 27 6e 70  00 00 00 00 00 00 00 00  |...l.'np........|
00000030  00 00 00 00 00 00 00 00  00 00 00 01 00 00 00 00  |................|
00000040  00 00 00 03 00 00 00 04  00 00 00 5c 5b d0 bf b0  |...........\[...|
00000050  00 00 00 03 00 00 00 27  00 00 00 00 41 52 4d 20  |.......'....ARM |
00000060  4c 69 6e 6b 73 79 73 20  46 49 54 20 28 46 6c 61  |Linksys FIT (Fla|
00000070  74 74 65 6e 65 64 20 49  6d 61 67 65 20 54 72 65  |ttened Image Tre|
00000080

Patch
diff mbox series

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)..."