From 3996b2586a00db93d7d7bf96ce733fd9fab041e7 Mon Sep 17 00:00:00 2001 From: Ronny Nilsson <ronny.nilsson@iopsys.eu> Date: Wed, 22 Apr 2020 22:26:40 +0200 Subject: [PATCH] base-files: extra sanity checks. --- .../base-files/lib/upgrade/iopsys-4-to-5-migrator.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/iopsys-brcm63xx-arm/base-files/lib/upgrade/iopsys-4-to-5-migrator.sh b/iopsys-brcm63xx-arm/base-files/lib/upgrade/iopsys-4-to-5-migrator.sh index 6744e92ac..52fbca001 100755 --- a/iopsys-brcm63xx-arm/base-files/lib/upgrade/iopsys-4-to-5-migrator.sh +++ b/iopsys-brcm63xx-arm/base-files/lib/upgrade/iopsys-4-to-5-migrator.sh @@ -384,6 +384,8 @@ erase_mtd() { #-------------------------------------------------------------- # Erase a UBI volume $1 (by name) and wait for it to disappear. erase_ubi_volume() { + [ -n "$1" ] || return 0 + if grep -q "$1" /sys/class/ubi/*/name; then ubirmvol "/dev/ubi0" -N "$1" || return @@ -414,6 +416,7 @@ erase_jffs_kernel() { [ $1 -ge 0 -a $1 -le 1 ] || return + grep -q "kernel_${1}" /sys/class/ubi/*/name && return 0 mtd="$(bcm_find_mtd kernel_${1})" || return [ -n "$mtd" ] || return 0 [ $mtd -gt 0 ] || return 0 -- GitLab