← Back to team overview

curtin-dev team mailing list archive

[Merge] ~mwhudson/curtin:even-more-v2-example-fixes into curtin:master

 

Michael Hudson-Doyle has proposed merging ~mwhudson/curtin:even-more-v2-example-fixes into curtin:master.

Commit message:
examples: stop assuming curtin will allow for overhead of logical partitions

Curtin currently has the slightly surprising (to me at least) behaviour
of enlarging an extended partition to account for the overhead that
comes from the fact that logical partitions have to have gaps between
them. I do not intend to preserve this in v2 partitioning (and will
handle this in subiquity) so change the two example files that depend on
this.

Also correct an offset in examples/tests/multipath-reuse.yaml.



Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/416498
-- 
Your team curtin developers is requested to review the proposed merge of ~mwhudson/curtin:even-more-v2-example-fixes into curtin:master.
diff --git a/examples/tests/lvm.yaml b/examples/tests/lvm.yaml
index 8eab6b0..1018d1b 100644
--- a/examples/tests/lvm.yaml
+++ b/examples/tests/lvm.yaml
@@ -23,7 +23,7 @@ storage:
         flag: boot
       - id: sda_extended
         type: partition
-        size: 5G
+        size: 5.5G
         flag: extended
         device: sda
       - id: sda2
diff --git a/examples/tests/lvm_iscsi.yaml b/examples/tests/lvm_iscsi.yaml
index dd7c2b6..e75d6d1 100644
--- a/examples/tests/lvm_iscsi.yaml
+++ b/examples/tests/lvm_iscsi.yaml
@@ -44,7 +44,7 @@ storage:
         wipe: superblock
       - id: sda_extended
         type: partition
-        size: 5G
+        size: 5.5G
         flag: extended
         device: sda
       - id: sda1
diff --git a/examples/tests/multipath-reuse.yaml b/examples/tests/multipath-reuse.yaml
index d3e9383..f008848 100644
--- a/examples/tests/multipath-reuse.yaml
+++ b/examples/tests/multipath-reuse.yaml
@@ -43,7 +43,7 @@ storage:
         size: 1GB
         device: sda
         preserve: true
-        offset: 4G
+        offset: 5G
       - id: sda1_root
         type: format
         fstype: ext4

Follow ups