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

[Jeff Kletsky]

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 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>
> 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

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.infradead.org/pipermail/openwrt-devel/attachments/20190616/47f2e267/attachment.htm>
-------------- next part --------------
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel