Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manifest-db: make all UUIDs unique #124

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 15 additions & 15 deletions manifest-db/centos_8-aarch64-ami-boot.json
Original file line number Diff line number Diff line change
Expand Up @@ -4821,13 +4821,13 @@
"options": {
"filesystems": [
{
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"uuid": "36e3aced-e822-48e8-86ef-b822c434bb6b",
"vfs_type": "xfs",
"path": "/",
"options": "defaults"
},
{
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "2da4fedf-6d46-4ba4-b39d-dc01e361d601",
"vfs_type": "xfs",
"path": "/boot",
"options": "defaults"
Expand All @@ -4845,8 +4845,8 @@
{
"type": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"root_fs_uuid": "38fcea08-6d9d-4b0b-9c73-b3b69fe43ea6",
"boot_fs_uuid": "0411cd0d-16ff-4de0-84e1-99d50bb06e48",
"kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto",
"uefi": {
"vendor": "centos"
Expand Down Expand Up @@ -4897,25 +4897,25 @@
"type": "org.osbuild.sfdisk",
"options": {
"label": "gpt",
"uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
"uuid": "434e3234-0a69-41eb-b5a8-39e700a7db99",
"partitions": [
{
"size": 409600,
"start": 2048,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
"uuid": "b7c264ba-4ff1-41ec-b007-1a4fa345dbee"
},
{
"size": 1024000,
"start": 411648,
"type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
"uuid": "35ec77fa-287f-462b-9643-68d11bcb2949"
},
{
"size": 19535839,
"start": 1435648,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
"uuid": "e94b2a5c-4a26-4434-bd60-8090f44ce840"
}
]
},
Expand Down Expand Up @@ -4949,7 +4949,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "2da4fedf-6d46-4ba4-b39d-dc01e361d601",
"label": "boot"
},
"devices": {
Expand All @@ -4967,7 +4967,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"uuid": "36e3aced-e822-48e8-86ef-b822c434bb6b",
"label": "root"
},
"devices": {
Expand Down Expand Up @@ -7014,17 +7014,17 @@
"bootable": false,
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"partuuid": "6f0a2880-86d4-4ebe-8049-a717d1aed687",
"size": 10002349568,
"start": 735051776,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75"
"uuid": "36e3aced-e822-48e8-86ef-b822c434bb6b"
},
{
"bootable": false,
"fstype": "vfat",
"label": null,
"partuuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33",
"partuuid": "c8cb26cc-4b48-4d1d-b58f-bfecf2ad945a",
"size": 209715200,
"start": 1048576,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
Expand All @@ -7034,11 +7034,11 @@
"bootable": false,
"fstype": "xfs",
"label": "boot",
"partuuid": "CB07C243-BC44-4717-853E-28852021225B",
"partuuid": "643fbcf8-d103-45ab-aa0a-0e7124983661",
"size": 524288000,
"start": 210763776,
"type": "BC13C2FF-59E6-4262-A352-B275FD6F7172",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
"uuid": "2da4fedf-6d46-4ba4-b39d-dc01e361d601"
}
],
"passwd": [
Expand Down
30 changes: 15 additions & 15 deletions manifest-db/centos_8-aarch64-ami-empty.json
Original file line number Diff line number Diff line change
Expand Up @@ -4821,13 +4821,13 @@
"options": {
"filesystems": [
{
"uuid": "308f6813-e223-438d-a043-a32c3a016c05",
"uuid": "4f691138-cf62-49d7-9033-14528651a7a1",
"vfs_type": "xfs",
"path": "/",
"options": "defaults"
},
{
"uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180",
"uuid": "b8b5da5d-ec32-4e19-a01e-7a27d8f60169",
"vfs_type": "xfs",
"path": "/boot",
"options": "defaults"
Expand All @@ -4845,8 +4845,8 @@
{
"type": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "308f6813-e223-438d-a043-a32c3a016c05",
"boot_fs_uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180",
"root_fs_uuid": "d8c3cfc4-ef5a-4c50-84c4-008ebb8e07ca",
"boot_fs_uuid": "d0ba6edb-821b-4d6b-b131-2de5a0a163c9",
"kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto",
"uefi": {
"vendor": "centos"
Expand Down Expand Up @@ -4897,25 +4897,25 @@
"type": "org.osbuild.sfdisk",
"options": {
"label": "gpt",
"uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
"uuid": "1617a967-56b9-442c-8110-21a1cecf0121",
"partitions": [
{
"size": 409600,
"start": 2048,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
"uuid": "4f2404b3-508b-4dcb-83cd-d755d2392d45"
},
{
"size": 2097152,
"start": 411648,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
"uuid": "d0dbc17c-eff2-48ba-8869-0a430542674e"
},
{
"size": 18462687,
"start": 2508800,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
"uuid": "d39731e2-bfa2-4883-ae8f-00a4aeda20cc"
}
]
},
Expand Down Expand Up @@ -4949,7 +4949,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180"
"uuid": "b8b5da5d-ec32-4e19-a01e-7a27d8f60169"
},
"devices": {
"device": {
Expand All @@ -4966,7 +4966,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "308f6813-e223-438d-a043-a32c3a016c05",
"uuid": "4f691138-cf62-49d7-9033-14528651a7a1",
"label": "root"
},
"devices": {
Expand Down Expand Up @@ -7034,17 +7034,17 @@
"bootable": false,
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"partuuid": "bb0399b5-aaf0-4c8b-b995-a2ed9889d20e",
"size": 9452895744,
"start": 1284505600,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "308f6813-e223-438d-a043-a32c3a016c05"
"uuid": "4f691138-cf62-49d7-9033-14528651a7a1"
},
{
"bootable": false,
"fstype": "vfat",
"label": null,
"partuuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33",
"partuuid": "91361f8b-416b-4d44-9b00-6acc8f61a5be",
"size": 209715200,
"start": 1048576,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
Expand All @@ -7054,11 +7054,11 @@
"bootable": false,
"fstype": "xfs",
"label": null,
"partuuid": "CB07C243-BC44-4717-853E-28852021225B",
"partuuid": "247d456d-f4a4-435e-aff2-b8400c027a76",
"size": 1073741824,
"start": 210763776,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180"
"uuid": "b8b5da5d-ec32-4e19-a01e-7a27d8f60169"
}
],
"passwd": [
Expand Down
2 changes: 1 addition & 1 deletion manifest-db/centos_8-aarch64-image_installer-boot.json
Original file line number Diff line number Diff line change
Expand Up @@ -8723,7 +8723,7 @@
{
"type": "org.osbuild.mkfs.ext4",
"options": {
"uuid": "2fe99653-f7ff-44fd-bea8-fa70107524fb",
"uuid": "99871e4f-5d44-48da-8a04-e2eddda3db78",
"label": "Anaconda"
},
"devices": {
Expand Down
2 changes: 1 addition & 1 deletion manifest-db/centos_8-aarch64-image_installer-empty.json
Original file line number Diff line number Diff line change
Expand Up @@ -8907,7 +8907,7 @@
{
"type": "org.osbuild.mkfs.ext4",
"options": {
"uuid": "2fe99653-f7ff-44fd-bea8-fa70107524fb",
"uuid": "65c6860f-5544-4def-9578-04ca778de148",
"label": "Anaconda"
},
"devices": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8907,7 +8907,7 @@
{
"type": "org.osbuild.mkfs.ext4",
"options": {
"uuid": "2fe99653-f7ff-44fd-bea8-fa70107524fb",
"uuid": "fda2e16f-11d2-4074-9552-1afe3bf1898e",
"label": "Anaconda"
},
"devices": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8723,7 +8723,7 @@
{
"type": "org.osbuild.mkfs.ext4",
"options": {
"uuid": "2fe99653-f7ff-44fd-bea8-fa70107524fb",
"uuid": "0481632b-7c61-4ed6-be94-e123f9a7fec8",
"label": "Anaconda"
},
"devices": {
Expand Down
18 changes: 9 additions & 9 deletions manifest-db/centos_8-aarch64-minimal_raw-empty.json
Original file line number Diff line number Diff line change
Expand Up @@ -5199,7 +5199,7 @@
"options": {
"filesystems": [
{
"uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180",
"uuid": "fc99abc0-fde3-43af-a9f2-0384bba802e2",
"vfs_type": "xfs",
"path": "/",
"options": "defaults"
Expand All @@ -5217,7 +5217,7 @@
{
"type": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180",
"root_fs_uuid": "ee8adee8-4cb2-464a-9932-8ff06a03aa42",
"kernel_opts": "ro",
"uefi": {
"vendor": "centos"
Expand Down Expand Up @@ -5296,19 +5296,19 @@
"type": "org.osbuild.sfdisk",
"options": {
"label": "gpt",
"uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
"uuid": "ea1d0e19-90c9-4db7-9518-652e9cd85136",
"partitions": [
{
"size": 204800,
"start": 2048,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
"uuid": "87fa9961-ca10-4ae5-b679-1da1fd778700"
},
{
"size": 6293471,
"start": 206848,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
"uuid": "f4eb04b1-9c08-44e6-a4cd-f8884ea24b53"
}
]
},
Expand Down Expand Up @@ -5342,7 +5342,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180",
"uuid": "fc99abc0-fde3-43af-a9f2-0384bba802e2",
"label": "root"
},
"devices": {
Expand Down Expand Up @@ -7527,17 +7527,17 @@
"bootable": false,
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"partuuid": "7195412c-8d1d-43b3-9b69-daaf4107186d",
"size": 3222257152,
"start": 105906176,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "4a3096bf-521c-4921-96ab-b0dd0092d180"
"uuid": "fc99abc0-fde3-43af-a9f2-0384bba802e2"
},
{
"bootable": false,
"fstype": "vfat",
"label": null,
"partuuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33",
"partuuid": "1af836fd-19d5-43f0-bce1-e11328cf42cd",
"size": 104857600,
"start": 1048576,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
Expand Down
18 changes: 9 additions & 9 deletions manifest-db/centos_8-aarch64-openstack-boot.json
Original file line number Diff line number Diff line change
Expand Up @@ -5009,7 +5009,7 @@
"options": {
"filesystems": [
{
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "b0e32914-eec6-4b56-8485-ec6e421afd7f",
"vfs_type": "xfs",
"path": "/",
"options": "defaults"
Expand All @@ -5027,7 +5027,7 @@
{
"type": "org.osbuild.grub2",
"options": {
"root_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"root_fs_uuid": "bd0bd368-1fe1-4c1a-a255-30cecc7539e1",
"kernel_opts": "ro net.ifnames=0",
"uefi": {
"vendor": "centos"
Expand Down Expand Up @@ -5061,19 +5061,19 @@
"type": "org.osbuild.sfdisk",
"options": {
"label": "gpt",
"uuid": "D209C89E-EA5E-4FBD-B161-B461CCE297E0",
"uuid": "693bb24c-2fdc-4eea-a069-251c6464e652",
"partitions": [
{
"size": 204800,
"start": 2048,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
"uuid": "3ba8bd5d-b4c9-4b7d-8285-f761bc289e15"
},
{
"size": 8181727,
"start": 206848,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
"uuid": "177fdf10-2ac2-4b83-9e64-8453f30827f6"
}
]
},
Expand Down Expand Up @@ -5107,7 +5107,7 @@
{
"type": "org.osbuild.mkfs.xfs",
"options": {
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"uuid": "b0e32914-eec6-4b56-8485-ec6e421afd7f",
"label": "root"
},
"devices": {
Expand Down Expand Up @@ -7273,17 +7273,17 @@
"bootable": false,
"fstype": "xfs",
"label": "root",
"partuuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562",
"partuuid": "c8bdd3b5-98b1-4c7d-9f4e-59ce952a8d2b",
"size": 4189044224,
"start": 105906176,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8"
"uuid": "b0e32914-eec6-4b56-8485-ec6e421afd7f"
},
{
"bootable": false,
"fstype": "vfat",
"label": null,
"partuuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33",
"partuuid": "1b03316a-852b-464f-b9c8-d3436c65ff21",
"size": 104857600,
"start": 1048576,
"type": "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
Expand Down
Loading
Loading