From: Javier Marcet Date: Sat, 4 Apr 2020 15:52:29 +0000 (+0200) Subject: base-files: upgrade: fix efi partitions size calculation X-Git-Tag: v21.02.2~67 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e81dd8a10a141936650da707447bdf3f976aab4b;p=openwrt%2Fstaging%2Fchunkeey.git base-files: upgrade: fix efi partitions size calculation We were missing (not using) the last sector of each partition, compared with the output of gparted. Signed-off-by: Javier Marcet [moved the dot] Signed-off-by: Christian Lamparter (cherry picked from commit 018ada5403f02921be22ee0cf49b88b2700ee105) --- diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 968893e226..13dbb7ab25 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -267,7 +267,7 @@ get_partitions() { # local type="$1" local lba="$(( $(hex_le32_to_cpu $4) * 0x100000000 + $(hex_le32_to_cpu $3) ))" local end="$(( $(hex_le32_to_cpu $6) * 0x100000000 + $(hex_le32_to_cpu $5) ))" - local num="$(( $end - $lba ))" + local num="$(( $end - $lba + 1 ))" [ "$type" = "00000000000000000000000000000000" ] && continue