wic: fix calculation of partition number

Total number of partitions should be taken into account when calculating
real partition number for msdos partition table. The number can be
different for the 4th partition: it can be 4 if there are 4 partitions in
the table and 5 if there are more than 4 partitions in the table. In the
latter case number 4 is occupied by extended partition.

[YOCTO #11790]

(From OE-Core rev: a1d18c00b8c9ce800a5147eaa71372083b8ae91e)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2017-07-17 10:25:28 +03:00
committed by Richard Purdie
parent a746a4c171
commit 5b2a7393f9

View File

@@ -108,7 +108,7 @@ class DirectImageCreator(BaseImageCreator):
if pnum == num:
if part.no_table:
return 0
if self.ptable_format == 'msdos' and realnum > 3:
if self.ptable_format == 'msdos' and realnum > 3 and len(parts) > 4:
# account for logical partition numbering, ex. sda5..
return realnum + 1
return realnum