maybe a good idea?

canonical · Nov 29, 2022 · 44fca22 · 44fca22
1 parent b61874a
commit 44fca22
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/subiquity/models/filesystem.py b/subiquity/models/filesystem.py
@@ -1586,7 +1586,14 @@ def _remove(self, obj):
         self._actions.remove(obj)
 
     def add_partition(self, device, *, size, offset, flag="", wipe=None,
-                      grub_device=None, partition_name=None):
+                      grub_device=None, partition_name=None,
+                      check_alignment=True):
+        align = device.alignment_data().part_align
+        if check_alignment:
+            if offset % align != 0 or size % align != 0:
+                raise Exception(
+                    "size %s or offset %s not aligned to %s",
+                    size, offset, align)
         from subiquity.common.filesystem import boot
         if device._fs is not None:
             raise Exception("%s is already formatted" % (device,))

diff --git a/subiquity/server/controllers/filesystem.py b/subiquity/server/controllers/filesystem.py
@@ -510,7 +510,8 @@ def apply_system(self, disk_id):
                    structure == volume.structure[-1]:
                     gap = gaps.largest_gap(disk)
                     size = gap.size - (offset - gap.offset)
-                part = self.model.add_partition(disk, offset=offset, size=size)
+                part = self.model.add_partition(
+                    disk, offset=offset, size=size, check_alignment=False)
 
             type_uuid = structure.gpt_part_type_uuid()
             if type_uuid: