Skip to content

Commit b13e1a3

Browse files
learmjlearmj
committed
IDP: Comment support in PMAP partition ref, update LUKS attrs
Add a comment string to the pmap schema so a helpful description can be given to a partition. Update all PMAPs. Update and standardise labels and mapper names for LUKS containers.
1 parent 2cf8648 commit b13e1a3

File tree

8 files changed

+54
-19
lines changed

8 files changed

+54
-19
lines changed

‎image/gpt/ab_userdata/device/provisionmap-clear.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
[
22
{
33
"attributes": {
4-
"PMAPversion": "1.2.0",
4+
"PMAPversion": "1.3.0",
55
"system_type": "slotted"
66
}
77
},
88
{
99
"partitions": [
1010
{
11+
"comment": "boot configuration",
1112
"image": "config"
1213
}
1314
]
@@ -17,6 +18,7 @@
1718
"A": {
1819
"partitions": [
1920
{
21+
"comment": "kernel + device tree + initramfs slot A",
2022
"image": "boot_a",
2123
"static": {
2224
"uuid": "<BOOT_UUID>",
@@ -32,6 +34,7 @@
3234
"B": {
3335
"partitions": [
3436
{
37+
"comment": "kernel + device tree + initramfs slot B",
3538
"image": "boot_b",
3639
"static": {
3740
"uuid": "<BOOT_UUID>",
@@ -47,6 +50,7 @@
4750
"A": {
4851
"partitions": [
4952
{
53+
"comment": "root filesystem slot A",
5054
"image": "system_a",
5155
"static": {
5256
"uuid": "<SYSTEM_UUID>",
@@ -62,6 +66,7 @@
6266
"B": {
6367
"partitions": [
6468
{
69+
"comment": "root filesystem slot B",
6570
"image": "system_b",
6671
"static": {
6772
"uuid": "<SYSTEM_UUID>",
@@ -75,6 +80,7 @@
7580
{
7681
"partitions": [
7782
{
83+
"comment": "user data - shared between slots",
7884
"image": "persistent"
7985
}
8086
]

‎image/gpt/ab_userdata/device/provisionmap-crypt.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
[
22
{
33
"attributes": {
4-
"PMAPversion": "1.3.1",
4+
"PMAPversion": "1.4.1",
55
"system_type": "slotted"
66
}
77
},
88
{
99
"partitions": [
1010
{
11+
"comment": "boot configuration",
1112
"image": "config"
1213
}
1314
]
@@ -17,6 +18,7 @@
1718
"A": {
1819
"partitions": [
1920
{
21+
"comment": "kernel + device tree + initramfs slot A",
2022
"image": "boot_a",
2123
"static": {
2224
"uuid": "<BOOT_UUID>",
@@ -32,6 +34,7 @@
3234
"B": {
3335
"partitions": [
3436
{
37+
"comment": "kernel + device tree + initramfs slot B",
3538
"image": "boot_b",
3639
"static": {
3740
"uuid": "<BOOT_UUID>",
@@ -48,15 +51,16 @@
4851
"key_size": 512,
4952
"cipher": "aes-xts-plain64",
5053
"hash": "sha256",
51-
"label": "root",
54+
"label": "OSDATA",
5255
"uuid": "<CRYPT_UUID>",
53-
"mname": "cryptroot",
56+
"mname": "osdata_crypt",
5457
"etype": "partitioned"
5558
},
5659
"slots": {
5760
"A": {
5861
"partitions": [
5962
{
63+
"comment": "Encrypted root filesystem slot A",
6064
"image": "system_a",
6165
"static": {
6266
"uuid": "<SYSTEM_UUID>",
@@ -68,6 +72,7 @@
6872
"B": {
6973
"partitions": [
7074
{
75+
"comment": "Encrypted root filesystem slot B",
7176
"image": "system_b",
7277
"static": {
7378
"uuid": "<SYSTEM_UUID>",
@@ -79,6 +84,7 @@
7984
},
8085
"partitions": [
8186
{
87+
"comment": "Encrypted user data - shared between slots",
8288
"image": "persistent"
8389
}
8490
]

‎image/gpt/ab_userdata/device/provisionmap-cryptdata.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
[
22
{
33
"attributes": {
4-
"PMAPversion": "1.0.0",
4+
"PMAPversion": "1.1.0",
55
"system_type": "slotted"
66
}
77
},
88
{
99
"partitions": [
1010
{
11+
"comment": "boot configuration",
1112
"image": "config"
1213
}
1314
]
@@ -17,6 +18,7 @@
1718
"A": {
1819
"partitions": [
1920
{
21+
"comment": "kernel + device tree + initramfs slot A",
2022
"image": "boot_a",
2123
"static": {
2224
"uuid": "<BOOT_UUID>",
@@ -32,6 +34,7 @@
3234
"B": {
3335
"partitions": [
3436
{
37+
"comment": "kernel + device tree + initramfs slot B",
3538
"image": "boot_b",
3639
"static": {
3740
"uuid": "<BOOT_UUID>",
@@ -47,6 +50,7 @@
4750
"A": {
4851
"partitions": [
4952
{
53+
"comment": "root filesystem slot A",
5054
"image": "system_a",
5155
"static": {
5256
"uuid": "<SYSTEM_UUID>",
@@ -62,6 +66,7 @@
6266
"B": {
6367
"partitions": [
6468
{
69+
"comment": "root filesystem slot B",
6570
"image": "system_b",
6671
"static": {
6772
"uuid": "<SYSTEM_UUID>",
@@ -78,13 +83,14 @@
7883
"key_size": 512,
7984
"cipher": "aes-xts-plain64",
8085
"hash": "sha256",
81-
"label": "root",
86+
"label": "USERDATA",
8287
"uuid": "<CRYPT_UUID>",
83-
"mname": "cryptroot",
88+
"mname": "userdata_crypt",
8489
"etype": "partitioned"
8590
},
8691
"partitions": [
8792
{
93+
"comment": "Encrypted user data - shared between slots",
8894
"image": "persistent"
8995
}
9096
]

‎image/gpt/ab_userdata/device/provisionmap-crypthybrid.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
[
22
{
33
"attributes": {
4-
"PMAPversion": "1.3.1",
4+
"PMAPversion": "1.4.1",
55
"system_type": "slotted"
66
}
77
},
88
{
99
"partitions": [
1010
{
11+
"comment": "boot configuration",
1112
"image": "config"
1213
}
1314
]
@@ -17,6 +18,7 @@
1718
"A": {
1819
"partitions": [
1920
{
21+
"comment": "kernel + device tree + initramfs slot A",
2022
"image": "boot_a",
2123
"static": {
2224
"uuid": "<BOOT_UUID>",
@@ -32,6 +34,7 @@
3234
"B": {
3335
"partitions": [
3436
{
37+
"comment": "kernel + device tree + initramfs slot B",
3538
"image": "boot_b",
3639
"static": {
3740
"uuid": "<BOOT_UUID>",
@@ -47,6 +50,7 @@
4750
"A": {
4851
"partitions": [
4952
{
53+
"comment": "root filesystem slot A",
5054
"image": "system_a",
5155
"static": {
5256
"uuid": "<SYSTEM_UUID>",
@@ -65,13 +69,14 @@
6569
"key_size": 512,
6670
"cipher": "aes-xts-plain64",
6771
"hash": "sha256",
68-
"label": "rootB",
72+
"label": "OSB",
6973
"uuid": "<CRYPT_UUID>",
70-
"mname": "cryptroot",
74+
"mname": "osb_crypt",
7175
"etype": "partitioned"
7276
},
7377
"partitions": [
7478
{
79+
"comment": "Encrypted root filesystem slot B",
7580
"image": "system_b",
7681
"static": {
7782
"uuid": "<SYSTEM_UUID>",
@@ -86,6 +91,7 @@
8691
{
8792
"partitions": [
8893
{
94+
"comment": "user data - shared between slots",
8995
"image": "persistent"
9096
}
9197
]

‎image/gpt/ab_userdata/device/provisionmap-cryptslots.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
[
22
{
33
"attributes": {
4-
"PMAPversion": "1.0.0",
4+
"PMAPversion": "1.1.0",
55
"system_type": "slotted"
66
}
77
},
88
{
99
"partitions": [
1010
{
11+
"comment": "boot configuration",
1112
"image": "config"
1213
}
1314
]
@@ -17,6 +18,7 @@
1718
"A": {
1819
"partitions": [
1920
{
21+
"comment": "kernel + device tree + initramfs slot A",
2022
"image": "boot_a",
2123
"static": {
2224
"uuid": "<BOOT_UUID>",
@@ -32,6 +34,7 @@
3234
"B": {
3335
"partitions": [
3436
{
37+
"comment": "kernel + device tree + initramfs slot B",
3538
"image": "boot_b",
3639
"static": {
3740
"uuid": "<BOOT_UUID>",
@@ -48,15 +51,16 @@
4851
"key_size": 512,
4952
"cipher": "aes-xts-plain64",
5053
"hash": "sha256",
51-
"label": "root",
54+
"label": "OSAB",
5255
"uuid": "<CRYPT_UUID>",
53-
"mname": "cryptroot",
56+
"mname": "osab_crypt",
5457
"etype": "partitioned"
5558
},
5659
"slots": {
5760
"A": {
5861
"partitions": [
5962
{
63+
"comment": "Encrypted root filesystem slot A",
6064
"image": "system_a",
6165
"static": {
6266
"uuid": "<SYSTEM_UUID>",
@@ -68,6 +72,7 @@
6872
"B": {
6973
"partitions": [
7074
{
75+
"comment": "Encrypted root filesystem slot B",
7176
"image": "system_b",
7277
"static": {
7378
"uuid": "<SYSTEM_UUID>",
@@ -82,6 +87,7 @@
8287
{
8388
"partitions": [
8489
{
90+
"comment": "user data - shared between slots",
8591
"image": "persistent"
8692
}
8793
]

‎image/mbr/simple_dual/device/provisionmap-clear.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
[
22
{
33
"attributes": {
4-
"PMAPversion": "1.0.0",
4+
"PMAPversion": "1.1.0",
55
"system_type": "flat"
66
}
77
},
88
{
99
"partitions": [
1010
{
11-
"image": "boot"
11+
"image": "boot",
12+
"comment": "kernel + device tree + initramfs"
1213
},
1314
{
14-
"image": "root"
15+
"image": "root",
16+
"comment": "root filesystem"
1517
}
1618
]
1719
}

‎image/mbr/simple_dual/device/provisionmap-crypt.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
[
22
{
33
"attributes": {
4-
"PMAPversion": "1.1.0",
4+
"PMAPversion": "1.2.0",
55
"system_type": "flat"
66
}
77
},
88
{
99
"partitions": [
1010
{
11+
"comment": "kernel + device tree + initramfs",
1112
"image": "boot"
1213
}
1314
]
@@ -17,14 +18,15 @@
1718
"luks2": {
1819
"key_size": 512,
1920
"cipher": "aes-xts-plain64",
20-
"label": "root",
21+
"label": "OSROOT",
2122
"uuid": "<CRYPT_UUID>",
2223
"hash": "sha256",
23-
"mname": "cryptroot",
24+
"mname": "osroot_crypt",
2425
"etype": "raw"
2526
},
2627
"partitions": [
2728
{
29+
"comment": "Encrypted root filesystem",
2830
"image": "root"
2931
}
3032
]

‎layer/base/schemas/provisionmap/v1/schema.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"additionalProperties": false,
2626
"properties": {
2727
"image": { "type": "string", "minLength": 1 },
28+
"comment": { "type": "string" },
2829
"static": {
2930
"type": "object",
3031
"additionalProperties": false,

0 commit comments

Comments
 (0)