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 <[email protected]>
[moved the dot]
Signed-off-by: Christian Lamparter <[email protected]>
(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 968893e2263512eec73b72f3c27d60efac617c94..13dbb7ab25d1e688563b1d0f031e73be26393787 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -267,7 +267,7 @@ get_partitions() { # <device> <filename>
                                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