particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

manifests: remove partition UUIDs from fcos container manifest

Browse source 
We don't set the UUIDs today in COSA/create_disk.sh so let's not
statically set them here either. This means they'll get set to
something random.
This commit is contained in:
Dusty Mabe 2024-01-10 16:49:44 -05:00 • committed by Simon de Vlieger
parent d089b429a7
commit 7cf98cfbf1
2 changed files with 8 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

24
test/data/manifests/fedora-coreos-container.json
View file

@ -563,29 +563,25 @@
"size": 2048, "size": 2048,
"type": "21686148-6449-6E6F-744E-656564454649", "type": "21686148-6449-6E6F-744E-656564454649",
"bootable": true, "bootable": true,
"name": "BIOS-BOOT", "name": "BIOS-BOOT"
"uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
}, },
{ {
"start": 4096, "start": 4096,
"size": 260096, "size": 260096,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"name": "EFI-SYSTEM", "name": "EFI-SYSTEM"
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
}, },
{ {
"start": 264192, "start": 264192,
"size": 786432, "size": 786432,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"name": "boot", "name": "boot"
"uuid": "61B2905B-DF3E-4FB3-80FA-49D1E773AA32"
}, },
{ {
"start": 1050624, "start": 1050624,
"size": 4194304, "size": 4194304,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"name": "root", "name": "root"
"uuid": "CA7D7CCB-63ED-4C53-861C-1742536059CC"
} }
] ]
} }
@ -774,29 +770,25 @@
"size": 256, "size": 256,
"type": "21686148-6449-6E6F-744E-656564454649", "type": "21686148-6449-6E6F-744E-656564454649",
"bootable": true, "bootable": true,
"name": "BIOS-BOOT", "name": "BIOS-BOOT"
"uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
}, },
{ {
"start": 512, "start": 512,
"size": 32512, "size": 32512,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B", "type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"name": "EFI-SYSTEM", "name": "EFI-SYSTEM"
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
}, },
{ {
"start": 33024, "start": 33024,
"size": 98304, "size": 98304,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"name": "boot", "name": "boot"
"uuid": "61B2905B-DF3E-4FB3-80FA-49D1E773AA32"
}, },
{ {
"start": 131328, "start": 131328,
"size": 524288, "size": 524288,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4", "type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"name": "root", "name": "root"
"uuid": "CA7D7CCB-63ED-4C53-861C-1742536059CC"
} }
] ]
} }

8
test/data/manifests/fedora-coreos-container.mpp.yaml
View file

@ -18,22 +18,18 @@ mpp-define-images:
- name: BIOS-BOOT - name: BIOS-BOOT
type: 21686148-6449-6E6F-744E-656564454649 type: 21686148-6449-6E6F-744E-656564454649
bootable: true bootable: true
uuid: FAC7F1FB-3E8D-4137-A512-961DE09A5549
size: size:
mpp-format-int: "{bios_boot_size_mb * 1024 * 1024 / sector_size}" mpp-format-int: "{bios_boot_size_mb * 1024 * 1024 / sector_size}"
- name: EFI-SYSTEM - name: EFI-SYSTEM
type: C12A7328-F81F-11D2-BA4B-00A0C93EC93B type: C12A7328-F81F-11D2-BA4B-00A0C93EC93B
uuid: 68B2905B-DF3E-4FB3-80FA-49D1E773AA33
size: size:
mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / sector_size}" mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / sector_size}"
- name: boot - name: boot
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4 type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
uuid: 61B2905B-DF3E-4FB3-80FA-49D1E773AA32
size: size:
mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}" mpp-format-int: "{boot_size_mb * 1024 * 1024 / sector_size}"
- name: root - name: root
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4 type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
uuid: CA7D7CCB-63ED-4C53-861C-1742536059CC
size: size:
mpp-format-int: "{root_size_mb * 1024 * 1024 / sector_size}" mpp-format-int: "{root_size_mb * 1024 * 1024 / sector_size}"
- id: image4k - id: image4k
@ -48,22 +44,18 @@ mpp-define-images:
- name: BIOS-BOOT - name: BIOS-BOOT
type: 21686148-6449-6E6F-744E-656564454649 type: 21686148-6449-6E6F-744E-656564454649
bootable: true bootable: true
uuid: FAC7F1FB-3E8D-4137-A512-961DE09A5549
size: size:
mpp-format-int: "{bios_boot_size_mb * 1024 * 1024 / four_k_sector_size}" mpp-format-int: "{bios_boot_size_mb * 1024 * 1024 / four_k_sector_size}"
- name: EFI-SYSTEM - name: EFI-SYSTEM
type: C12A7328-F81F-11D2-BA4B-00A0C93EC93B type: C12A7328-F81F-11D2-BA4B-00A0C93EC93B
uuid: 68B2905B-DF3E-4FB3-80FA-49D1E773AA33
size: size:
mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / four_k_sector_size}" mpp-format-int: "{efi_system_size_mb * 1024 * 1024 / four_k_sector_size}"
- name: boot - name: boot
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4 type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
uuid: 61B2905B-DF3E-4FB3-80FA-49D1E773AA32
size: size:
mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}" mpp-format-int: "{boot_size_mb * 1024 * 1024 / four_k_sector_size}"
- name: root - name: root
type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4 type: 0FC63DAF-8483-4772-8E79-3D69D8477DE4
uuid: CA7D7CCB-63ED-4C53-861C-1742536059CC
size: size:
mpp-format-int: "{root_size_mb * 1024 * 1024 / four_k_sector_size}" mpp-format-int: "{root_size_mb * 1024 * 1024 / four_k_sector_size}"
pipelines: pipelines: