Merge ~mwhudson/curtin:v2-even-even-more-example-tweaks into curtin:master

Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: Dan Bungert
Approved revision: e76116a0b8eb106ac2372ed0076d0c0552f692f8
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~mwhudson/curtin:v2-even-even-more-example-tweaks
Merge into: curtin:master
Diff against target: 56 lines (+4/-5)
3 files modified
examples/tests/bcache-partitions.yaml (+0/-1)
examples/tests/lvm_iscsi.yaml (+2/-2)
examples/tests/mirrorboot.yaml (+2/-2)
Reviewer Review Type Date Requested Status
Dan Bungert Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+416635@code.launchpad.net

Commit message

examples: even more tweaks for v2

bcache-partitions.yaml: remove the ptable setting on a drive that will
be part of a bcache. A quirk of v1 partitioning is that setting ptable:
gpt on a disk but then creating no partitions will leave the disk with
no partition table.

lvm_iscsi.yaml: enlarge some partitions, one for / and one because of
the logical partition overhead.

mirrorboot.yaml: make / slightly larger.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Dan Bungert (dbungert) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/examples/tests/bcache-partitions.yaml b/examples/tests/bcache-partitions.yaml
2index 20ccddc..90861bc 100644
3--- a/examples/tests/bcache-partitions.yaml
4+++ b/examples/tests/bcache-partitions.yaml
5@@ -18,7 +18,6 @@ storage:
6 type: disk
7 name: rotary1
8 serial: disk-c
9- ptable: gpt
10 wipe: superblock
11 - id: id_rotary0_part1
12 type: partition
13diff --git a/examples/tests/lvm_iscsi.yaml b/examples/tests/lvm_iscsi.yaml
14index e75d6d1..1f2ad01 100644
15--- a/examples/tests/lvm_iscsi.yaml
16+++ b/examples/tests/lvm_iscsi.yaml
17@@ -12,7 +12,7 @@ storage:
18 - id: vdb1
19 type: partition
20 number: 1
21- size: 3GB
22+ size: 4GB
23 device: vdb
24 flag: boot
25 - id: vdb2
26@@ -100,7 +100,7 @@ storage:
27 wipe: superblock
28 - id: sdb_extended
29 type: partition
30- size: 4G
31+ size: 4.5G
32 flag: extended
33 device: sdb
34 - id: sdb1
35diff --git a/examples/tests/mirrorboot.yaml b/examples/tests/mirrorboot.yaml
36index 42fdc93..83217d8 100644
37--- a/examples/tests/mirrorboot.yaml
38+++ b/examples/tests/mirrorboot.yaml
39@@ -17,7 +17,7 @@ storage:
40 flag: bios_grub
41 - id: sda1
42 type: partition
43- size: 3GB
44+ size: 3.5GB
45 device: sda
46 - id: sdb
47 type: disk
48@@ -28,7 +28,7 @@ storage:
49 name: second_disk
50 - id: sdb1
51 type: partition
52- size: 3GB
53+ size: 3.5GB
54 device: sdb
55 - id: mddevice
56 name: md0

Subscribers

People subscribed via source and target branches