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

base-files: emit diagnostics on sysupgrade abort

Browse Source 
Emit diagnostics if nand sysupgrade is aborted because UBI partition
cannot be attached. Also avoid redudndant checks.

Signed-off-by: Rodrigo Balerdi <lanchon@gmail.com>
This commit is contained in:
Rodrigo Balerdi
2022-04-15 00:44:26 -03:00
committed by Daniel Golle
parent 3f2d0703b6
commit f5ed603d0c
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
package/base-files/files/lib/upgrade/nand.sh
View File

@@ -136,18 +136,23 @@ nand_upgrade_prepare_ubi() {
ubiattach -m "$mtdnum" ubiattach -m "$mtdnum"
sync sync
ubidev="$( nand_find_ubi "$CI_UBIPART" )" ubidev="$( nand_find_ubi "$CI_UBIPART" )"
fi
if [ ! "$ubidev" ]; then if [ ! "$ubidev" ]; then
ubiformat /dev/mtd$mtdnum -y ubiformat /dev/mtd$mtdnum -y
ubiattach -m "$mtdnum" ubiattach -m "$mtdnum"
sync sync
ubidev="$( nand_find_ubi "$CI_UBIPART" )" ubidev="$( nand_find_ubi "$CI_UBIPART" )"
[ ! "$ubidev" ] && return 1
[ "$has_env" -gt 0 ] && { if [ ! "$ubidev" ]; then
echo "cannot attach ubi mtd partition $CI_UBIPART"
return 1
fi
if [ "$has_env" -gt 0 ]; then
ubimkvol /dev/$ubidev -n 0 -N ubootenv -s 1MiB ubimkvol /dev/$ubidev -n 0 -N ubootenv -s 1MiB
ubimkvol /dev/$ubidev -n 1 -N ubootenv2 -s 1MiB ubimkvol /dev/$ubidev -n 1 -N ubootenv2 -s 1MiB
} fi
fi
fi fi
local kern_ubivol="$( nand_find_volume $ubidev $CI_KERNPART )" local kern_ubivol="$( nand_find_volume $ubidev $CI_KERNPART )"