From 57b05e924bba7b2fff07a34690474c0fa3046865 Mon Sep 17 00:00:00 2001 From: Maciej Borzecki Date: Mon, 16 Jan 2017 11:41:51 +0100 Subject: wic: partitionedfs: account for non-table partitions when checking if logical parititon is needed Commit 8c1c43b7901a9fcd8b279eb4250b08157ad345b7 `wic: Create a logical partition only when it is really mandatory` did not account for partitions that are not present in partition table. Signed-off-by: Maciej Borzecki Signed-off-by: Ross Burton --- scripts/lib/wic/utils/partitionedfs.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py index 68301f0b47..721d514326 100644 --- a/scripts/lib/wic/utils/partitionedfs.py +++ b/scripts/lib/wic/utils/partitionedfs.py @@ -201,7 +201,8 @@ class Image(): part['num'] = 0 if disk['ptable_format'] == "msdos": - if len(self.partitions) > 4: + # only count the partitions that are in partition table + if len([p for p in self.partitions if not p['no_table']]) > 4: if disk['realpart'] > 3: part['type'] = 'logical' part['num'] = disk['realpart'] + 1 -- cgit 1.2.3-korg