[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3670/8267] wic: Create a logical partition only when it is really mandatory

[Emmanuele Bassi <ebassi src gnome org>]

commit 8c1c43b7901a9fcd8b279eb4250b08157ad345b7
Author: Alessio Igor Bogani <alessio bogani elettra eu>
Date:   Wed Dec 7 15:00:57 2016 +0100

    wic: Create a logical partition only when it is really mandatory
    
    Don't worth bother with logical partition on MBR partition type (aka
    msdos) if disk image generated by wic should have 4 partitions.
    
    (From OE-Core rev: 36a558fbdc96094626e7de1a3510691e30885368)
    
    Signed-off-by: Alessio Igor Bogani <alessio bogani elettra eu>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/utils/partitionedfs.py |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index 9e76487..9ea4a30 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -201,9 +201,10 @@ class Image():
                 part['num'] = 0
 
             if disk['ptable_format'] == "msdos":
-                if disk['realpart'] > 3:
-                    part['type'] = 'logical'
-                    part['num'] = disk['realpart'] + 1
+                if len(self.partitions) > 4:
+                    if disk['realpart'] > 3:
+                        part['type'] = 'logical'
+                        part['num'] = disk['realpart'] + 1
 
             disk['partitions'].append(num)
             msger.debug("Assigned %s to %s%d, sectors range %d-%d size %d "