Merge ~dbungert/curtin:v1-extended-sizing into curtin:master

[Dan Bungert]

block-meta: remove extension of extended part size

In v1 action mode, the size of the extended partition is currently
extended by 1MiB to counter for the 1MiB gap in between logical
partition. Remove that. Callers are expected to provide appropriate
sizing.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:f974822a489c0800ce06bb6b6f452c4016749665
https://jenkins.ubuntu.com/server/job/curtin-ci/287/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/287/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/287/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/287/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/287/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/287//rebuild

review: Approve (continuous-integration)

[Michael Hudson-Doyle (mwhudson)]

I guess the only question is if MAAS might rely on this. I sincerely hope not though.

[Michael Hudson-Doyle (mwhudson)]

Actually it looks like maas works around this in a way that this change will probably break. I'd still like to change this, but maybe by killing v1 entirely.

review: Disapprove

Unmerged commits

f974822... by Dan Bungert on 2022-04-14

block-meta: remove extension of extended part size

In v1 action mode, the size of the extended partition is currently
extended by 1MiB to counter for the 1MiB gap in between logical
partiton. Remove that. Callers are expected to provide appropriate
sizing.

diff --git a/curtin/commands/block_meta.py b/curtin/commands/block_meta.py
index 5614883..c986e94 100644
--- a/curtin/commands/block_meta.py
+++ b/curtin/commands/block_meta.py
@@ -928,12 +928,6 @@ def partition_handler(info, storage_config, handlers):
     # start sector is part of the sectors that define the partitions size
     # so length has to be "size in sectors - 1"
     length_sectors = int(length_bytes / logical_block_size_bytes) - 1
-    # logical partitions can't share their start sector with the extended
-    # partition and logical partitions can't go head-to-head, so we have to
-    # realign and for that increase size as required
-    if info.get('flag') == "extended":
-        logdisks = getnumberoflogicaldisks(device, storage_config)
-        length_sectors = length_sectors + (logdisks * alignment_offset)
 
     # Handle preserve flag
     create_partition = True
diff --git a/tests/integration/test_block_meta.py b/tests/integration/test_block_meta.py
index be69bc0..2b939d0 100644
--- a/tests/integration/test_block_meta.py
+++ b/tests/integration/test_block_meta.py
@@ -272,9 +272,7 @@ class TestBlockMeta(IntegrationTestCase):
         img = self.tmp_path('image.img')
         config = StorageConfigBuilder(version=version)
         config.add_image(path=img, size='100M', ptable='msdos')
-        # curtin adds 1MiB to the size of the extend partition per contained
-        # logical partition, but only in v1 mode
-        size = '97M' if version == 1 else '99M'
+        size = '99M'
         config.add_part(size=size, number=1, flag='extended')
         config.add_part(size='10M', number=5, flag='logical')
         config.add_part(size='10M', number=6, flag='logical')