summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-07-17 10:25:28 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-29 15:11:38 +0100
commita1d18c00b8c9ce800a5147eaa71372083b8ae91e (patch)
treee1dfafb5314c46724af18d531c5e0b259cf20aeb /scripts
parentef47f682034f591c90572c082a753787aa1a8b9c (diff)
downloadopenembedded-core-contrib-a1d18c00b8c9ce800a5147eaa71372083b8ae91e.tar.gz
openembedded-core-contrib-a1d18c00b8c9ce800a5147eaa71372083b8ae91e.tar.bz2
openembedded-core-contrib-a1d18c00b8c9ce800a5147eaa71372083b8ae91e.zip
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 <ed.bartosh@linux.intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/imager/direct.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index edf5e5d221..4c547e04a6 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -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