diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2022-04-13 14:51:34 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-04-15 14:11:59 +0100 |
| commit | 6fe3852d47de88e575cbbde0745c7e1ba719a909 (patch) | |
| tree | dc153f7db6fa34399ae03aa235226c85c6bf92d8 | |
| parent | 5e617186404ce578adf4ec3f2f1c90fd671c8f9b (diff) | |
| download | openwrt-6fe3852d47de88e575cbbde0745c7e1ba719a909.tar.gz openwrt-6fe3852d47de88e575cbbde0745c7e1ba719a909.tar.bz2 openwrt-6fe3852d47de88e575cbbde0745c7e1ba719a909.zip | |
base-files: more robust sysupgrade on NAND
Make sure sysupgrade on NAND also works in case of UBI volumes having
index >9. While at it, also make sure UBI device is detected and abort
in case it isn't. Use Shell built-in shorthand ':' instead of 'true'.
Fixes #9708
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 0dbca1b2baf9c26514b517a1e5860f6a5b04d5ae)
| -rw-r--r-- | package/base-files/files/lib/upgrade/nand.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh index 19be9dd730..8720a78b4b 100644 --- a/package/base-files/files/lib/upgrade/nand.sh +++ b/package/base-files/files/lib/upgrade/nand.sh @@ -143,6 +143,7 @@ nand_upgrade_prepare_ubi() { ubiattach -m "$mtdnum" sync ubidev="$( nand_find_ubi "$CI_UBIPART" )" + [ ! "$ubidev" ] && return 1 [ "$has_env" -gt 0 ] && { ubimkvol /dev/$ubidev -n 0 -N ubootenv -s 1MiB ubimkvol /dev/$ubidev -n 1 -N ubootenv2 -s 1MiB @@ -154,8 +155,13 @@ nand_upgrade_prepare_ubi() { local data_ubivol="$( nand_find_volume $ubidev rootfs_data )" local ubiblk ubiblkvol - for ubiblk in /dev/ubiblock*_? ; do + for ubiblk in /dev/ubiblock${ubidev:3}_* ; do [ -e "$ubiblk" ] || continue + case "$ubiblk" in + /dev/ubiblock*_*p*) + continue + ;; + esac echo "removing ubiblock${ubiblk:13}" ubiblkvol=ubi${ubiblk:13} if ! ubiblock -r /dev/$ubiblkvol; then @@ -165,9 +171,9 @@ nand_upgrade_prepare_ubi() { done # kill volumes - [ "$kern_ubivol" ] && ubirmvol /dev/$ubidev -N $CI_KERNPART || true - [ "$root_ubivol" -a "$root_ubivol" != "$kern_ubivol" ] && ubirmvol /dev/$ubidev -N $CI_ROOTPART || true - [ "$data_ubivol" ] && ubirmvol /dev/$ubidev -N rootfs_data || true + [ "$kern_ubivol" ] && ubirmvol /dev/$ubidev -N $CI_KERNPART || : + [ "$root_ubivol" -a "$root_ubivol" != "$kern_ubivol" ] && ubirmvol /dev/$ubidev -N $CI_ROOTPART || : + [ "$data_ubivol" ] && ubirmvol /dev/$ubidev -N rootfs_data || : # update kernel if [ -n "$kernel_length" ]; then |