domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipq40xx: fix openmesh sysupgrade with tar content out of order

Browse Source 
The tar extraction depends on the order in which the files
are added to the tar file. Since the order is not guaranteed
and depends on the host system, the combined mtd write fails
with sysupgrade images built on some systems.
Fix by changing to tar file order independent mtd write.

Fixes: 86e18f6706 ("ipq806x: add support for OpenMesh A42")
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
This commit is contained in:
Marek Lindner
2018-12-02 22:02:04 +08:00
committed by Mathias Kresin
parent 06a20afb34
commit fbadfecbb5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh
View File

@@ -76,9 +76,9 @@ platform_do_upgrade_openmesh() {
# take care of restoring a saved config # take care of restoring a saved config
[ "$SAVE_CONFIG" -eq 1 ] && restore_backup="${MTD_CONFIG_ARGS} -j ${CONF_TAR}" [ "$SAVE_CONFIG" -eq 1 ] && restore_backup="${MTD_CONFIG_ARGS} -j ${CONF_TAR}"
# write concatinated kernel + rootfs to flash mtd -q erase inactive
tar xf $tar_file ${board_dir}/kernel ${board_dir}/root -O | \ tar xf $tar_file ${board_dir}/root -O | mtd -n -p $kernel_length $restore_backup write - $PART_NAME
mtd $restore_backup write - $PART_NAME tar xf $tar_file ${board_dir}/kernel -O | mtd -n write - $PART_NAME
# prepare new u-boot env # prepare new u-boot env
if [ "$next_boot_part" = "1" ]; then if [ "$next_boot_part" = "1" ]; then