From: Chee Yang Lee Date: Sun, 22 Mar 2020 06:57:20 +0000 (+0800) Subject: wic/direct: reserve 2 sector for extended partition X-Git-Tag: 2020-04-dunfell~133 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=884c8a0e50a49bdca5e048197a9dc0ff37cc8d1a;p=openembedded-core.git wic/direct: reserve 2 sector for extended partition extended partition should reserve at least 2 unallocated sectors between the start of the extended partition and the start of a logical partition. [YOCTO #13658] Signed-off-by: Chee Yang Lee Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index c50645ff76..2d06c242b6 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -403,7 +403,7 @@ class PartitionedImage(): # Reserve a sector for EBR for every logical partition # before alignment is performed. if part.type == 'logical': - self.offset += 1 + self.offset += 2 align_sectors = 0 if part.align: @@ -446,7 +446,7 @@ class PartitionedImage(): self.extendedpart = part.num else: self.extended_size_sec += align_sectors - self.extended_size_sec += part.size_sec + 1 + self.extended_size_sec += part.size_sec + 2 else: self.primary_part_num += 1 part.num = self.primary_part_num @@ -512,7 +512,7 @@ class PartitionedImage(): # add a sector at the back, so that there is enough # room for all logical partitions. self._create_partition(self.path, "extended", - None, part.start - 1, + None, part.start - 2, self.extended_size_sec) if part.fstype == "swap":