From: Ed Bartosh Date: Mon, 17 Jul 2017 07:04:04 +0000 (+0300) Subject: wic: fix calculation of partition number X-Git-Tag: uninative-1.7~115 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5689139b3cd862e2df49f6b21171f513e8a46c60;p=openembedded-core.git 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] Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton --- diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index aa9cc9f4e3..f20d8433f1 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -313,7 +313,7 @@ class PartitionedImage(): part.realnum = 0 else: realnum += 1 - if self.ptable_format == 'msdos' and realnum > 3: + if self.ptable_format == 'msdos' and realnum > 3 and len(partitions) > 4: part.realnum = realnum + 1 continue part.realnum = realnum