diff options
author | Maciej Borzecki <maciej.borzecki@rndity.com> | 2017-01-16 11:41:51 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-19 22:47:20 +0000 |
commit | cb10cfd64f25ad902a67997eb6a98dcfa0918cea (patch) | |
tree | b735a7ee9688dd002d3899489fec8090a7a9d26c /scripts | |
parent | 47400e36484b2da96d568a4d26a9cef8fb5ed592 (diff) | |
download | poky-cb10cfd64f25ad902a67997eb6a98dcfa0918cea.tar.gz |
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.
(From OE-Core rev: 57b05e924bba7b2fff07a34690474c0fa3046865)
Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/wic/utils/partitionedfs.py | 3 |
1 files changed, 2 insertions, 1 deletions
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(): | |||
201 | part['num'] = 0 | 201 | part['num'] = 0 |
202 | 202 | ||
203 | if disk['ptable_format'] == "msdos": | 203 | if disk['ptable_format'] == "msdos": |
204 | if len(self.partitions) > 4: | 204 | # only count the partitions that are in partition table |
205 | if len([p for p in self.partitions if not p['no_table']]) > 4: | ||
205 | if disk['realpart'] > 3: | 206 | if disk['realpart'] > 3: |
206 | part['type'] = 'logical' | 207 | part['type'] = 'logical' |
207 | part['num'] = disk['realpart'] + 1 | 208 | part['num'] = disk['realpart'] + 1 |