From 54857a049cb30f3ae1046cc5d05b08853642fff3 Mon Sep 17 00:00:00 2001 From: imagebuilder-bot Date: Wed, 1 May 2024 13:28:54 +0000 Subject: [PATCH] Update to 106 Resolves: RHEL-32133 --- .gitignore | 1 + ...path-as-secondary-sort-key-for-fstab.patch | 47 - 0002-test-regenerate-manifests.patch | 3137 ----------------- ...-dbjobqueue-fix-bad-errors.As-usages.patch | 81 - osbuild-composer.spec | 260 +- sources | 2 +- 6 files changed, 26 insertions(+), 3502 deletions(-) delete mode 100644 0001-osbuild-use-path-as-secondary-sort-key-for-fstab.patch delete mode 100644 0002-test-regenerate-manifests.patch delete mode 100644 0003-dbjobqueue-fix-bad-errors.As-usages.patch diff --git a/.gitignore b/.gitignore index b2346ff..146769c 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ /osbuild-composer-98.tar.gz /osbuild-composer-99.tar.gz /osbuild-composer-100.tar.gz +/osbuild-composer-106.tar.gz diff --git a/0001-osbuild-use-path-as-secondary-sort-key-for-fstab.patch b/0001-osbuild-use-path-as-secondary-sort-key-for-fstab.patch deleted file mode 100644 index f387630..0000000 --- a/0001-osbuild-use-path-as-secondary-sort-key-for-fstab.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c20e1e53c4bc174f63533b5d572dec86657cd5a0 Mon Sep 17 00:00:00 2001 -From: Achilleas Koutsou -Date: Mon, 25 Jul 2022 11:26:16 +0200 -Subject: [PATCH 1/7] osbuild: use path as secondary sort key for fstab - -Most filesystems entries in fstab don't have a PassNo, which makes the -order of those entries dependent on the sorting algorithm. Changes in -the algorithm can introduce changes in the sort order, which we don't -like. - -Add a secondary sorting key, the Path, which is guaranteed unique, to -guarantee stable ordering. ---- - internal/osbuild/fstab_stage.go | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/internal/osbuild/fstab_stage.go b/internal/osbuild/fstab_stage.go -index 72ecb59bb..d0cc66a22 100644 ---- a/internal/osbuild/fstab_stage.go -+++ b/internal/osbuild/fstab_stage.go -@@ -1,6 +1,7 @@ - package osbuild - - import ( -+ "fmt" - "sort" - - "github.com/osbuild/osbuild-composer/internal/disk" -@@ -64,10 +65,14 @@ func NewFSTabStageOptions(pt *disk.PartitionTable) *FSTabStageOptions { - return nil - } - -+ key := func(fs *FSTabEntry) string { -+ return fmt.Sprintf("%d%s", fs.PassNo, fs.Path) -+ } -+ - _ = pt.ForEachMountable(genOption) // genOption always returns nil - // sort the entries by PassNo to maintain backward compatibility - sort.Slice(options.FileSystems, func(i, j int) bool { -- return options.FileSystems[i].PassNo < options.FileSystems[j].PassNo -+ return key(options.FileSystems[i]) < key(options.FileSystems[j]) - }) - return &options - } --- -2.35.3 - diff --git a/0002-test-regenerate-manifests.patch b/0002-test-regenerate-manifests.patch deleted file mode 100644 index 3dce637..0000000 --- a/0002-test-regenerate-manifests.patch +++ /dev/null @@ -1,3137 +0,0 @@ -From 93592dabc1355490c16d1b80a8a39d059a7429e9 Mon Sep 17 00:00:00 2001 -From: Achilleas Koutsou -Date: Mon, 25 Jul 2022 22:07:13 +0200 -Subject: [PATCH 2/7] test: regenerate manifests - ---- - .../manifests/centos_8-aarch64-ami-boot.json | 8 ++++---- - .../centos_8-aarch64-qcow2_customize-boot.json | 8 ++++---- - .../centos_8-ppc64le-qcow2_customize-boot.json | 8 ++++---- - .../centos_8-x86_64-qcow2_customize-boot.json | 8 ++++---- - .../manifests/centos_9-aarch64-ami-boot.json | 8 ++++---- - .../centos_9-aarch64-openstack-boot.json | 8 ++++---- - .../manifests/centos_9-aarch64-qcow2-boot.json | 8 ++++---- - .../centos_9-aarch64-qcow2_customize-boot.json | 8 ++++---- - .../manifests/centos_9-ppc64le-qcow2-boot.json | 8 ++++---- - .../centos_9-ppc64le-qcow2_customize-boot.json | 8 ++++---- - .../manifests/centos_9-s390x-qcow2-boot.json | 8 ++++---- - .../centos_9-s390x-qcow2_customize-boot.json | 8 ++++---- - .../data/manifests/centos_9-x86_64-ami-boot.json | 8 ++++---- - .../data/manifests/centos_9-x86_64-gce-boot.json | 8 ++++---- - .../data/manifests/centos_9-x86_64-oci-boot.json | 8 ++++---- - .../centos_9-x86_64-openstack-boot.json | 8 ++++---- - .../manifests/centos_9-x86_64-qcow2-boot.json | 8 ++++---- - .../centos_9-x86_64-qcow2_customize-boot.json | 8 ++++---- - .../data/manifests/centos_9-x86_64-vhd-boot.json | 8 ++++---- - .../manifests/centos_9-x86_64-vmdk-boot.json | 8 ++++---- - .../manifests/fedora_35-aarch64-ami-boot.json | 8 ++++---- - .../manifests/fedora_35-aarch64-oci-boot.json | 8 ++++---- - .../fedora_35-aarch64-openstack-boot.json | 8 ++++---- - .../manifests/fedora_35-aarch64-qcow2-boot.json | 8 ++++---- - .../fedora_35-aarch64-qcow2_customize-boot.json | 8 ++++---- - .../manifests/fedora_35-x86_64-ami-boot.json | 8 ++++---- - .../manifests/fedora_35-x86_64-oci-boot.json | 8 ++++---- - .../fedora_35-x86_64-openstack-boot.json | 8 ++++---- - .../manifests/fedora_35-x86_64-qcow2-boot.json | 8 ++++---- - .../fedora_35-x86_64-qcow2_customize-boot.json | 8 ++++---- - .../manifests/fedora_35-x86_64-vhd-boot.json | 8 ++++---- - .../manifests/fedora_35-x86_64-vmdk-boot.json | 8 ++++---- - .../manifests/fedora_36-aarch64-ami-boot.json | 8 ++++---- - .../manifests/fedora_36-aarch64-oci-boot.json | 8 ++++---- - .../fedora_36-aarch64-openstack-boot.json | 8 ++++---- - .../manifests/fedora_36-aarch64-qcow2-boot.json | 8 ++++---- - .../fedora_36-aarch64-qcow2_customize-boot.json | 8 ++++---- - .../manifests/fedora_36-x86_64-ami-boot.json | 8 ++++---- - .../manifests/fedora_36-x86_64-oci-boot.json | 8 ++++---- - .../fedora_36-x86_64-openstack-boot.json | 8 ++++---- - .../manifests/fedora_36-x86_64-qcow2-boot.json | 8 ++++---- - .../fedora_36-x86_64-qcow2_customize-boot.json | 8 ++++---- - .../manifests/fedora_36-x86_64-vhd-boot.json | 8 ++++---- - .../manifests/fedora_36-x86_64-vmdk-boot.json | 8 ++++---- - .../manifests/rhel_7-x86_64-azure_rhui-boot.json | 16 ++++++++-------- - .../data/manifests/rhel_7-x86_64-qcow2-boot.json | 8 ++++---- - .../rhel_7-x86_64-qcow2_customize-boot.json | 8 ++++---- - test/data/manifests/rhel_8-aarch64-ami-boot.json | 8 ++++---- - test/data/manifests/rhel_8-aarch64-ec2-boot.json | 8 ++++---- - .../manifests/rhel_8-x86_64-azure_rhui-boot.json | 16 ++++++++-------- - .../data/manifests/rhel_84-aarch64-ami-boot.json | 8 ++++---- - .../data/manifests/rhel_84-aarch64-ec2-boot.json | 8 ++++---- - .../rhel_84-x86_64-azure_rhui-boot.json | 16 ++++++++-------- - .../data/manifests/rhel_85-aarch64-ami-boot.json | 8 ++++---- - .../data/manifests/rhel_85-aarch64-ec2-boot.json | 8 ++++---- - .../rhel_85-aarch64-qcow2_customize-boot.json | 12 ++++++------ - .../rhel_85-ppc64le-qcow2_customize-boot.json | 12 ++++++------ - .../rhel_85-s390x-qcow2_customize-boot.json | 12 ++++++------ - .../rhel_85-x86_64-azure_rhui-boot.json | 16 ++++++++-------- - .../rhel_85-x86_64-qcow2_customize-boot.json | 12 ++++++------ - .../data/manifests/rhel_86-aarch64-ami-boot.json | 8 ++++---- - .../data/manifests/rhel_86-aarch64-ec2-boot.json | 8 ++++---- - .../rhel_86-aarch64-qcow2_customize-boot.json | 8 ++++---- - .../rhel_86-ppc64le-qcow2_customize-boot.json | 8 ++++---- - .../rhel_86-s390x-qcow2_customize-boot.json | 8 ++++---- - .../rhel_86-x86_64-azure_rhui-boot.json | 16 ++++++++-------- - .../rhel_86-x86_64-qcow2_customize-boot.json | 8 ++++---- - .../data/manifests/rhel_87-aarch64-ami-boot.json | 8 ++++---- - .../data/manifests/rhel_87-aarch64-ec2-boot.json | 8 ++++---- - .../rhel_87-aarch64-qcow2_customize-boot.json | 8 ++++---- - .../rhel_87-ppc64le-qcow2_customize-boot.json | 8 ++++---- - .../rhel_87-s390x-qcow2_customize-boot.json | 8 ++++---- - .../rhel_87-x86_64-azure_rhui-boot.json | 16 ++++++++-------- - .../rhel_87-x86_64-qcow2_customize-boot.json | 8 ++++---- - .../data/manifests/rhel_90-aarch64-ami-boot.json | 8 ++++---- - .../data/manifests/rhel_90-aarch64-ec2-boot.json | 8 ++++---- - .../rhel_90-aarch64-openstack-boot.json | 8 ++++---- - .../manifests/rhel_90-aarch64-qcow2-boot.json | 8 ++++---- - .../rhel_90-aarch64-qcow2_customize-boot.json | 8 ++++---- - .../manifests/rhel_90-ppc64le-qcow2-boot.json | 8 ++++---- - .../rhel_90-ppc64le-qcow2_customize-boot.json | 8 ++++---- - .../data/manifests/rhel_90-s390x-qcow2-boot.json | 8 ++++---- - .../rhel_90-s390x-qcow2_customize-boot.json | 8 ++++---- - test/data/manifests/rhel_90-x86_64-ami-boot.json | 8 ++++---- - .../rhel_90-x86_64-azure_rhui-boot.json | 16 ++++++++-------- - test/data/manifests/rhel_90-x86_64-ec2-boot.json | 8 ++++---- - .../manifests/rhel_90-x86_64-ec2_ha-boot.json | 8 ++++---- - .../manifests/rhel_90-x86_64-ec2_sap-boot.json | 8 ++++---- - test/data/manifests/rhel_90-x86_64-gce-boot.json | 8 ++++---- - .../manifests/rhel_90-x86_64-gce_rhui-boot.json | 8 ++++---- - test/data/manifests/rhel_90-x86_64-oci-boot.json | 8 ++++---- - .../manifests/rhel_90-x86_64-openstack-boot.json | 8 ++++---- - .../manifests/rhel_90-x86_64-qcow2-boot.json | 8 ++++---- - .../rhel_90-x86_64-qcow2_customize-boot.json | 8 ++++---- - test/data/manifests/rhel_90-x86_64-vhd-boot.json | 8 ++++---- - .../data/manifests/rhel_90-x86_64-vmdk-boot.json | 8 ++++---- - .../data/manifests/rhel_91-aarch64-ami-boot.json | 8 ++++---- - .../data/manifests/rhel_91-aarch64-ec2-boot.json | 8 ++++---- - .../rhel_91-aarch64-openstack-boot.json | 8 ++++---- - .../manifests/rhel_91-aarch64-qcow2-boot.json | 8 ++++---- - .../rhel_91-aarch64-qcow2_customize-boot.json | 8 ++++---- - .../manifests/rhel_91-ppc64le-qcow2-boot.json | 8 ++++---- - .../rhel_91-ppc64le-qcow2_customize-boot.json | 8 ++++---- - .../data/manifests/rhel_91-s390x-qcow2-boot.json | 8 ++++---- - .../rhel_91-s390x-qcow2_customize-boot.json | 8 ++++---- - test/data/manifests/rhel_91-x86_64-ami-boot.json | 8 ++++---- - .../rhel_91-x86_64-azure_rhui-boot.json | 16 ++++++++-------- - test/data/manifests/rhel_91-x86_64-ec2-boot.json | 8 ++++---- - .../manifests/rhel_91-x86_64-ec2_ha-boot.json | 8 ++++---- - .../manifests/rhel_91-x86_64-ec2_sap-boot.json | 8 ++++---- - test/data/manifests/rhel_91-x86_64-gce-boot.json | 8 ++++---- - .../manifests/rhel_91-x86_64-gce_rhui-boot.json | 8 ++++---- - test/data/manifests/rhel_91-x86_64-oci-boot.json | 8 ++++---- - .../manifests/rhel_91-x86_64-openstack-boot.json | 8 ++++---- - .../manifests/rhel_91-x86_64-qcow2-boot.json | 8 ++++---- - .../rhel_91-x86_64-qcow2_customize-boot.json | 8 ++++---- - test/data/manifests/rhel_91-x86_64-vhd-boot.json | 8 ++++---- - .../data/manifests/rhel_91-x86_64-vmdk-boot.json | 8 ++++---- - 118 files changed, 512 insertions(+), 512 deletions(-) - -diff --git a/test/data/manifests/centos_8-aarch64-ami-boot.json b/test/data/manifests/centos_8-aarch64-ami-boot.json -index 794b45fd9..3f50f6d0b 100644 ---- a/test/data/manifests/centos_8-aarch64-ami-boot.json -+++ b/test/data/manifests/centos_8-aarch64-ami-boot.json -@@ -5394,15 +5394,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/centos_8-aarch64-qcow2_customize-boot.json b/test/data/manifests/centos_8-aarch64-qcow2_customize-boot.json -index ed7d0d6a4..989785166 100644 ---- a/test/data/manifests/centos_8-aarch64-qcow2_customize-boot.json -+++ b/test/data/manifests/centos_8-aarch64-qcow2_customize-boot.json -@@ -5919,15 +5919,15 @@ - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/opt", -+ "path": "/boot", - "options": "defaults" - }, - { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/opt", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/centos_8-ppc64le-qcow2_customize-boot.json b/test/data/manifests/centos_8-ppc64le-qcow2_customize-boot.json -index c1e539395..8d79188fe 100644 ---- a/test/data/manifests/centos_8-ppc64le-qcow2_customize-boot.json -+++ b/test/data/manifests/centos_8-ppc64le-qcow2_customize-boot.json -@@ -6327,15 +6327,15 @@ - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/opt", -+ "path": "/boot", - "options": "defaults" - }, - { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/opt", - "options": "defaults" - } - ] -diff --git a/test/data/manifests/centos_8-x86_64-qcow2_customize-boot.json b/test/data/manifests/centos_8-x86_64-qcow2_customize-boot.json -index a86133aea..ededf68ae 100644 ---- a/test/data/manifests/centos_8-x86_64-qcow2_customize-boot.json -+++ b/test/data/manifests/centos_8-x86_64-qcow2_customize-boot.json -@@ -6015,15 +6015,15 @@ - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/opt", -+ "path": "/boot", - "options": "defaults" - }, - { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/opt", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/centos_9-aarch64-ami-boot.json b/test/data/manifests/centos_9-aarch64-ami-boot.json -index 6ef5b47c6..fdf7a0f12 100644 ---- a/test/data/manifests/centos_9-aarch64-ami-boot.json -+++ b/test/data/manifests/centos_9-aarch64-ami-boot.json -@@ -5106,15 +5106,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/centos_9-aarch64-openstack-boot.json b/test/data/manifests/centos_9-aarch64-openstack-boot.json -index 8198a1d72..c5524d6e4 100644 ---- a/test/data/manifests/centos_9-aarch64-openstack-boot.json -+++ b/test/data/manifests/centos_9-aarch64-openstack-boot.json -@@ -5077,15 +5077,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/centos_9-aarch64-qcow2-boot.json b/test/data/manifests/centos_9-aarch64-qcow2-boot.json -index b8844174c..deab2b3bb 100644 ---- a/test/data/manifests/centos_9-aarch64-qcow2-boot.json -+++ b/test/data/manifests/centos_9-aarch64-qcow2-boot.json -@@ -5123,15 +5123,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json b/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json -index 09129cebc..41aab3a09 100644 ---- a/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json -+++ b/test/data/manifests/centos_9-aarch64-qcow2_customize-boot.json -@@ -5368,15 +5368,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/centos_9-ppc64le-qcow2-boot.json b/test/data/manifests/centos_9-ppc64le-qcow2-boot.json -index ba43a8a85..9841ebd04 100644 ---- a/test/data/manifests/centos_9-ppc64le-qcow2-boot.json -+++ b/test/data/manifests/centos_9-ppc64le-qcow2-boot.json -@@ -5611,15 +5611,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - } - ] -diff --git a/test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json b/test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json -index 0e3f77a56..075778eae 100644 ---- a/test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json -+++ b/test/data/manifests/centos_9-ppc64le-qcow2_customize-boot.json -@@ -5856,15 +5856,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/centos_9-s390x-qcow2-boot.json b/test/data/manifests/centos_9-s390x-qcow2-boot.json -index fc7ff00ec..42b6d1b53 100644 ---- a/test/data/manifests/centos_9-s390x-qcow2-boot.json -+++ b/test/data/manifests/centos_9-s390x-qcow2-boot.json -@@ -6307,15 +6307,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - } - ] -diff --git a/test/data/manifests/centos_9-s390x-qcow2_customize-boot.json b/test/data/manifests/centos_9-s390x-qcow2_customize-boot.json -index bda4a3c53..12acf2102 100644 ---- a/test/data/manifests/centos_9-s390x-qcow2_customize-boot.json -+++ b/test/data/manifests/centos_9-s390x-qcow2_customize-boot.json -@@ -6552,15 +6552,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/centos_9-x86_64-ami-boot.json b/test/data/manifests/centos_9-x86_64-ami-boot.json -index cb4c58e48..3a28c32b7 100644 ---- a/test/data/manifests/centos_9-x86_64-ami-boot.json -+++ b/test/data/manifests/centos_9-x86_64-ami-boot.json -@@ -4958,15 +4958,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/centos_9-x86_64-gce-boot.json b/test/data/manifests/centos_9-x86_64-gce-boot.json -index 69ffa9bcd..26e5bc025 100644 ---- a/test/data/manifests/centos_9-x86_64-gce-boot.json -+++ b/test/data/manifests/centos_9-x86_64-gce-boot.json -@@ -5150,15 +5150,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/centos_9-x86_64-oci-boot.json b/test/data/manifests/centos_9-x86_64-oci-boot.json -index 5276ba905..0e10ee831 100644 ---- a/test/data/manifests/centos_9-x86_64-oci-boot.json -+++ b/test/data/manifests/centos_9-x86_64-oci-boot.json -@@ -5262,15 +5262,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/centos_9-x86_64-openstack-boot.json b/test/data/manifests/centos_9-x86_64-openstack-boot.json -index 66fef9366..d0be2ab65 100644 ---- a/test/data/manifests/centos_9-x86_64-openstack-boot.json -+++ b/test/data/manifests/centos_9-x86_64-openstack-boot.json -@@ -5341,15 +5341,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/centos_9-x86_64-qcow2-boot.json b/test/data/manifests/centos_9-x86_64-qcow2-boot.json -index bf1e91698..69b2b0858 100644 ---- a/test/data/manifests/centos_9-x86_64-qcow2-boot.json -+++ b/test/data/manifests/centos_9-x86_64-qcow2-boot.json -@@ -5283,15 +5283,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json b/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json -index d878b2c6c..6bc13d306 100644 ---- a/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json -+++ b/test/data/manifests/centos_9-x86_64-qcow2_customize-boot.json -@@ -5624,15 +5624,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/centos_9-x86_64-vhd-boot.json b/test/data/manifests/centos_9-x86_64-vhd-boot.json -index 3460bf9d0..85eeea69f 100644 ---- a/test/data/manifests/centos_9-x86_64-vhd-boot.json -+++ b/test/data/manifests/centos_9-x86_64-vhd-boot.json -@@ -5287,15 +5287,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/centos_9-x86_64-vmdk-boot.json b/test/data/manifests/centos_9-x86_64-vmdk-boot.json -index 6d82a4eaf..112ad3c66 100644 ---- a/test/data/manifests/centos_9-x86_64-vmdk-boot.json -+++ b/test/data/manifests/centos_9-x86_64-vmdk-boot.json -@@ -5341,15 +5341,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_35-aarch64-ami-boot.json b/test/data/manifests/fedora_35-aarch64-ami-boot.json -index 080c28936..5f38d751b 100644 ---- a/test/data/manifests/fedora_35-aarch64-ami-boot.json -+++ b/test/data/manifests/fedora_35-aarch64-ami-boot.json -@@ -4475,15 +4475,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_35-aarch64-oci-boot.json b/test/data/manifests/fedora_35-aarch64-oci-boot.json -index 31c0d9b0f..8392d0ac4 100644 ---- a/test/data/manifests/fedora_35-aarch64-oci-boot.json -+++ b/test/data/manifests/fedora_35-aarch64-oci-boot.json -@@ -4478,15 +4478,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_35-aarch64-openstack-boot.json b/test/data/manifests/fedora_35-aarch64-openstack-boot.json -index e5f9ffb79..e56d64af1 100644 ---- a/test/data/manifests/fedora_35-aarch64-openstack-boot.json -+++ b/test/data/manifests/fedora_35-aarch64-openstack-boot.json -@@ -4690,15 +4690,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_35-aarch64-qcow2-boot.json b/test/data/manifests/fedora_35-aarch64-qcow2-boot.json -index 6de4f4e51..2f4d6aa69 100644 ---- a/test/data/manifests/fedora_35-aarch64-qcow2-boot.json -+++ b/test/data/manifests/fedora_35-aarch64-qcow2-boot.json -@@ -4499,15 +4499,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_35-aarch64-qcow2_customize-boot.json b/test/data/manifests/fedora_35-aarch64-qcow2_customize-boot.json -index 992d9898c..bb97b0b22 100644 ---- a/test/data/manifests/fedora_35-aarch64-qcow2_customize-boot.json -+++ b/test/data/manifests/fedora_35-aarch64-qcow2_customize-boot.json -@@ -4746,15 +4746,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_35-x86_64-ami-boot.json b/test/data/manifests/fedora_35-x86_64-ami-boot.json -index f62e9efea..55069473c 100644 ---- a/test/data/manifests/fedora_35-x86_64-ami-boot.json -+++ b/test/data/manifests/fedora_35-x86_64-ami-boot.json -@@ -4467,15 +4467,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_35-x86_64-oci-boot.json b/test/data/manifests/fedora_35-x86_64-oci-boot.json -index e711f8a87..be5322155 100644 ---- a/test/data/manifests/fedora_35-x86_64-oci-boot.json -+++ b/test/data/manifests/fedora_35-x86_64-oci-boot.json -@@ -4590,15 +4590,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_35-x86_64-openstack-boot.json b/test/data/manifests/fedora_35-x86_64-openstack-boot.json -index 920890fe4..1e433be13 100644 ---- a/test/data/manifests/fedora_35-x86_64-openstack-boot.json -+++ b/test/data/manifests/fedora_35-x86_64-openstack-boot.json -@@ -4730,15 +4730,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_35-x86_64-qcow2-boot.json b/test/data/manifests/fedora_35-x86_64-qcow2-boot.json -index 145639f60..7afa91c26 100644 ---- a/test/data/manifests/fedora_35-x86_64-qcow2-boot.json -+++ b/test/data/manifests/fedora_35-x86_64-qcow2-boot.json -@@ -4611,15 +4611,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_35-x86_64-qcow2_customize-boot.json b/test/data/manifests/fedora_35-x86_64-qcow2_customize-boot.json -index 0e0725dd8..405e21747 100644 ---- a/test/data/manifests/fedora_35-x86_64-qcow2_customize-boot.json -+++ b/test/data/manifests/fedora_35-x86_64-qcow2_customize-boot.json -@@ -4858,15 +4858,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_35-x86_64-vhd-boot.json b/test/data/manifests/fedora_35-x86_64-vhd-boot.json -index c21037594..82de48e04 100644 ---- a/test/data/manifests/fedora_35-x86_64-vhd-boot.json -+++ b/test/data/manifests/fedora_35-x86_64-vhd-boot.json -@@ -4349,15 +4349,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_35-x86_64-vmdk-boot.json b/test/data/manifests/fedora_35-x86_64-vmdk-boot.json -index 2f43cb8fa..44b3a0924 100644 ---- a/test/data/manifests/fedora_35-x86_64-vmdk-boot.json -+++ b/test/data/manifests/fedora_35-x86_64-vmdk-boot.json -@@ -4610,15 +4610,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_36-aarch64-ami-boot.json b/test/data/manifests/fedora_36-aarch64-ami-boot.json -index 69f940c31..2bbcc0592 100644 ---- a/test/data/manifests/fedora_36-aarch64-ami-boot.json -+++ b/test/data/manifests/fedora_36-aarch64-ami-boot.json -@@ -4843,15 +4843,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_36-aarch64-oci-boot.json b/test/data/manifests/fedora_36-aarch64-oci-boot.json -index dc446f507..8938266ad 100644 ---- a/test/data/manifests/fedora_36-aarch64-oci-boot.json -+++ b/test/data/manifests/fedora_36-aarch64-oci-boot.json -@@ -4830,15 +4830,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_36-aarch64-openstack-boot.json b/test/data/manifests/fedora_36-aarch64-openstack-boot.json -index 76522173c..c4d682e0b 100644 ---- a/test/data/manifests/fedora_36-aarch64-openstack-boot.json -+++ b/test/data/manifests/fedora_36-aarch64-openstack-boot.json -@@ -5074,15 +5074,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_36-aarch64-qcow2-boot.json b/test/data/manifests/fedora_36-aarch64-qcow2-boot.json -index 71933ad89..1cff618ea 100644 ---- a/test/data/manifests/fedora_36-aarch64-qcow2-boot.json -+++ b/test/data/manifests/fedora_36-aarch64-qcow2-boot.json -@@ -4851,15 +4851,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_36-aarch64-qcow2_customize-boot.json b/test/data/manifests/fedora_36-aarch64-qcow2_customize-boot.json -index 25b8c3045..5baf99da2 100644 ---- a/test/data/manifests/fedora_36-aarch64-qcow2_customize-boot.json -+++ b/test/data/manifests/fedora_36-aarch64-qcow2_customize-boot.json -@@ -5272,15 +5272,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_36-x86_64-ami-boot.json b/test/data/manifests/fedora_36-x86_64-ami-boot.json -index 3eaaf39db..b65b00853 100644 ---- a/test/data/manifests/fedora_36-x86_64-ami-boot.json -+++ b/test/data/manifests/fedora_36-x86_64-ami-boot.json -@@ -4883,15 +4883,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_36-x86_64-oci-boot.json b/test/data/manifests/fedora_36-x86_64-oci-boot.json -index 11989cc48..b553f026a 100644 ---- a/test/data/manifests/fedora_36-x86_64-oci-boot.json -+++ b/test/data/manifests/fedora_36-x86_64-oci-boot.json -@@ -4974,15 +4974,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_36-x86_64-openstack-boot.json b/test/data/manifests/fedora_36-x86_64-openstack-boot.json -index 1084e6529..aeebca1e9 100644 ---- a/test/data/manifests/fedora_36-x86_64-openstack-boot.json -+++ b/test/data/manifests/fedora_36-x86_64-openstack-boot.json -@@ -5154,15 +5154,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_36-x86_64-qcow2-boot.json b/test/data/manifests/fedora_36-x86_64-qcow2-boot.json -index 4a52decbf..50d3a68da 100644 ---- a/test/data/manifests/fedora_36-x86_64-qcow2-boot.json -+++ b/test/data/manifests/fedora_36-x86_64-qcow2-boot.json -@@ -4995,15 +4995,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_36-x86_64-qcow2_customize-boot.json b/test/data/manifests/fedora_36-x86_64-qcow2_customize-boot.json -index f9dfcb237..e22bab7a0 100644 ---- a/test/data/manifests/fedora_36-x86_64-qcow2_customize-boot.json -+++ b/test/data/manifests/fedora_36-x86_64-qcow2_customize-boot.json -@@ -5416,15 +5416,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_36-x86_64-vhd-boot.json b/test/data/manifests/fedora_36-x86_64-vhd-boot.json -index ef89f8d77..c69fc86a5 100644 ---- a/test/data/manifests/fedora_36-x86_64-vhd-boot.json -+++ b/test/data/manifests/fedora_36-x86_64-vhd-boot.json -@@ -4797,15 +4797,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/fedora_36-x86_64-vmdk-boot.json b/test/data/manifests/fedora_36-x86_64-vmdk-boot.json -index 35f37f26d..42e17839d 100644 ---- a/test/data/manifests/fedora_36-x86_64-vmdk-boot.json -+++ b/test/data/manifests/fedora_36-x86_64-vmdk-boot.json -@@ -4994,15 +4994,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "ext4", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "ext4", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json -index 056fb5a72..28ac15b54 100644 ---- a/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json -+++ b/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json -@@ -2501,9 +2501,9 @@ - "options": { - "filesystems": [ - { -- "uuid": "f83b8e88-3bbf-457a-ab99-c5b252c7429c", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/var", -+ "path": "/", - "options": "defaults" - }, - { -@@ -2518,12 +2518,6 @@ - "path": "/home", - "options": "defaults" - }, -- { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -- "vfs_type": "xfs", -- "path": "/", -- "options": "defaults" -- }, - { - "uuid": "a178892e-e285-4ce1-9114-55780875d64e", - "vfs_type": "xfs", -@@ -2536,6 +2530,12 @@ - "path": "/usr", - "options": "defaults" - }, -+ { -+ "uuid": "f83b8e88-3bbf-457a-ab99-c5b252c7429c", -+ "vfs_type": "xfs", -+ "path": "/var", -+ "options": "defaults" -+ }, - { - "uuid": "7B77-95E7", - "vfs_type": "vfat", -diff --git a/test/data/manifests/rhel_7-x86_64-qcow2-boot.json b/test/data/manifests/rhel_7-x86_64-qcow2-boot.json -index 89c820e40..b98e16d7c 100644 ---- a/test/data/manifests/rhel_7-x86_64-qcow2-boot.json -+++ b/test/data/manifests/rhel_7-x86_64-qcow2-boot.json -@@ -1693,15 +1693,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_7-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_7-x86_64-qcow2_customize-boot.json -index f25fcc26f..db8681ec4 100644 ---- a/test/data/manifests/rhel_7-x86_64-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_7-x86_64-qcow2_customize-boot.json -@@ -1810,15 +1810,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_8-aarch64-ami-boot.json b/test/data/manifests/rhel_8-aarch64-ami-boot.json -index 5e3764c76..385b7c67f 100644 ---- a/test/data/manifests/rhel_8-aarch64-ami-boot.json -+++ b/test/data/manifests/rhel_8-aarch64-ami-boot.json -@@ -2242,15 +2242,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_8-aarch64-ec2-boot.json b/test/data/manifests/rhel_8-aarch64-ec2-boot.json -index d99e766f2..be81fd0a4 100644 ---- a/test/data/manifests/rhel_8-aarch64-ec2-boot.json -+++ b/test/data/manifests/rhel_8-aarch64-ec2-boot.json -@@ -2258,15 +2258,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_8-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_8-x86_64-azure_rhui-boot.json -index 37769e43e..e6fd0d254 100644 ---- a/test/data/manifests/rhel_8-x86_64-azure_rhui-boot.json -+++ b/test/data/manifests/rhel_8-x86_64-azure_rhui-boot.json -@@ -2974,9 +2974,9 @@ - "options": { - "filesystems": [ - { -- "uuid": "f83b8e88-3bbf-457a-ab99-c5b252c7429c", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/var", -+ "path": "/", - "options": "defaults" - }, - { -@@ -2991,12 +2991,6 @@ - "path": "/home", - "options": "defaults" - }, -- { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -- "vfs_type": "xfs", -- "path": "/", -- "options": "defaults" -- }, - { - "uuid": "a178892e-e285-4ce1-9114-55780875d64e", - "vfs_type": "xfs", -@@ -3009,6 +3003,12 @@ - "path": "/usr", - "options": "defaults" - }, -+ { -+ "uuid": "f83b8e88-3bbf-457a-ab99-c5b252c7429c", -+ "vfs_type": "xfs", -+ "path": "/var", -+ "options": "defaults" -+ }, - { - "uuid": "7B77-95E7", - "vfs_type": "vfat", -diff --git a/test/data/manifests/rhel_84-aarch64-ami-boot.json b/test/data/manifests/rhel_84-aarch64-ami-boot.json -index e46182437..3de4303f7 100644 ---- a/test/data/manifests/rhel_84-aarch64-ami-boot.json -+++ b/test/data/manifests/rhel_84-aarch64-ami-boot.json -@@ -2275,15 +2275,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_84-aarch64-ec2-boot.json b/test/data/manifests/rhel_84-aarch64-ec2-boot.json -index efcaabc48..0760bb0b5 100644 ---- a/test/data/manifests/rhel_84-aarch64-ec2-boot.json -+++ b/test/data/manifests/rhel_84-aarch64-ec2-boot.json -@@ -2291,15 +2291,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json -index df23e2c6d..d31052e39 100644 ---- a/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json -+++ b/test/data/manifests/rhel_84-x86_64-azure_rhui-boot.json -@@ -3004,9 +3004,9 @@ - "options": { - "filesystems": [ - { -- "uuid": "f83b8e88-3bbf-457a-ab99-c5b252c7429c", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/var", -+ "path": "/", - "options": "defaults" - }, - { -@@ -3021,12 +3021,6 @@ - "path": "/home", - "options": "defaults" - }, -- { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -- "vfs_type": "xfs", -- "path": "/", -- "options": "defaults" -- }, - { - "uuid": "a178892e-e285-4ce1-9114-55780875d64e", - "vfs_type": "xfs", -@@ -3039,6 +3033,12 @@ - "path": "/usr", - "options": "defaults" - }, -+ { -+ "uuid": "f83b8e88-3bbf-457a-ab99-c5b252c7429c", -+ "vfs_type": "xfs", -+ "path": "/var", -+ "options": "defaults" -+ }, - { - "uuid": "7B77-95E7", - "vfs_type": "vfat", -diff --git a/test/data/manifests/rhel_85-aarch64-ami-boot.json b/test/data/manifests/rhel_85-aarch64-ami-boot.json -index 7e2554607..bd1087d1a 100644 ---- a/test/data/manifests/rhel_85-aarch64-ami-boot.json -+++ b/test/data/manifests/rhel_85-aarch64-ami-boot.json -@@ -2239,15 +2239,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_85-aarch64-ec2-boot.json b/test/data/manifests/rhel_85-aarch64-ec2-boot.json -index 9c6502025..ec6468445 100644 ---- a/test/data/manifests/rhel_85-aarch64-ec2-boot.json -+++ b/test/data/manifests/rhel_85-aarch64-ec2-boot.json -@@ -2255,15 +2255,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json -index 164827c93..d25e7e6ef 100644 ---- a/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json -@@ -2457,21 +2457,21 @@ - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "a178892e-e285-4ce1-9114-55780875d64e", - "vfs_type": "xfs", -- "path": "/usr", -+ "path": "/boot", - "options": "defaults" - }, - { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/var", -+ "path": "/usr", - "options": "defaults" - }, - { -- "uuid": "a178892e-e285-4ce1-9114-55780875d64e", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/var", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json -index 587d8bedf..2d7827c1f 100644 ---- a/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json -@@ -2619,21 +2619,21 @@ - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "a178892e-e285-4ce1-9114-55780875d64e", - "vfs_type": "xfs", -- "path": "/usr", -+ "path": "/boot", - "options": "defaults" - }, - { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/var", -+ "path": "/usr", - "options": "defaults" - }, - { -- "uuid": "a178892e-e285-4ce1-9114-55780875d64e", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/var", - "options": "defaults" - } - ] -diff --git a/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json -index 4839005e3..860fc0bbc 100644 ---- a/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json -@@ -2725,21 +2725,21 @@ - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "a178892e-e285-4ce1-9114-55780875d64e", - "vfs_type": "xfs", -- "path": "/usr", -+ "path": "/boot", - "options": "defaults" - }, - { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/var", -+ "path": "/usr", - "options": "defaults" - }, - { -- "uuid": "a178892e-e285-4ce1-9114-55780875d64e", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/var", - "options": "defaults" - } - ] -diff --git a/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json -index cd88a9e4e..af79bcb3f 100644 ---- a/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json -+++ b/test/data/manifests/rhel_85-x86_64-azure_rhui-boot.json -@@ -2977,9 +2977,9 @@ - "options": { - "filesystems": [ - { -- "uuid": "f83b8e88-3bbf-457a-ab99-c5b252c7429c", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/var", -+ "path": "/", - "options": "defaults" - }, - { -@@ -2994,12 +2994,6 @@ - "path": "/home", - "options": "defaults" - }, -- { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -- "vfs_type": "xfs", -- "path": "/", -- "options": "defaults" -- }, - { - "uuid": "a178892e-e285-4ce1-9114-55780875d64e", - "vfs_type": "xfs", -@@ -3012,6 +3006,12 @@ - "path": "/usr", - "options": "defaults" - }, -+ { -+ "uuid": "f83b8e88-3bbf-457a-ab99-c5b252c7429c", -+ "vfs_type": "xfs", -+ "path": "/var", -+ "options": "defaults" -+ }, - { - "uuid": "7B77-95E7", - "vfs_type": "vfat", -diff --git a/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json -index 775bc8fa8..20d01c464 100644 ---- a/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json -@@ -2496,21 +2496,21 @@ - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "a178892e-e285-4ce1-9114-55780875d64e", - "vfs_type": "xfs", -- "path": "/usr", -+ "path": "/boot", - "options": "defaults" - }, - { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/var", -+ "path": "/usr", - "options": "defaults" - }, - { -- "uuid": "a178892e-e285-4ce1-9114-55780875d64e", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/var", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_86-aarch64-ami-boot.json b/test/data/manifests/rhel_86-aarch64-ami-boot.json -index f4b8b5287..03f5b4561 100644 ---- a/test/data/manifests/rhel_86-aarch64-ami-boot.json -+++ b/test/data/manifests/rhel_86-aarch64-ami-boot.json -@@ -2242,15 +2242,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_86-aarch64-ec2-boot.json b/test/data/manifests/rhel_86-aarch64-ec2-boot.json -index 886ec3b7e..b2580e1e2 100644 ---- a/test/data/manifests/rhel_86-aarch64-ec2-boot.json -+++ b/test/data/manifests/rhel_86-aarch64-ec2-boot.json -@@ -2258,15 +2258,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json -index 6ff790c9a..09cd6d41c 100644 ---- a/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_86-aarch64-qcow2_customize-boot.json -@@ -2458,15 +2458,15 @@ - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/opt", -+ "path": "/boot", - "options": "defaults" - }, - { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/opt", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json -index 43e468bba..df0b7d87b 100644 ---- a/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_86-ppc64le-qcow2_customize-boot.json -@@ -2611,15 +2611,15 @@ - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/opt", -+ "path": "/boot", - "options": "defaults" - }, - { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/opt", - "options": "defaults" - } - ] -diff --git a/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json -index 1607b6b6a..13f5c7a67 100644 ---- a/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_86-s390x-qcow2_customize-boot.json -@@ -2708,15 +2708,15 @@ - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/opt", -+ "path": "/boot", - "options": "defaults" - }, - { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/opt", - "options": "defaults" - } - ] -diff --git a/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json -index 4e19073e4..694c3f305 100644 ---- a/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json -+++ b/test/data/manifests/rhel_86-x86_64-azure_rhui-boot.json -@@ -2974,9 +2974,9 @@ - "options": { - "filesystems": [ - { -- "uuid": "f83b8e88-3bbf-457a-ab99-c5b252c7429c", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/var", -+ "path": "/", - "options": "defaults" - }, - { -@@ -2991,12 +2991,6 @@ - "path": "/home", - "options": "defaults" - }, -- { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -- "vfs_type": "xfs", -- "path": "/", -- "options": "defaults" -- }, - { - "uuid": "a178892e-e285-4ce1-9114-55780875d64e", - "vfs_type": "xfs", -@@ -3009,6 +3003,12 @@ - "path": "/usr", - "options": "defaults" - }, -+ { -+ "uuid": "f83b8e88-3bbf-457a-ab99-c5b252c7429c", -+ "vfs_type": "xfs", -+ "path": "/var", -+ "options": "defaults" -+ }, - { - "uuid": "7B77-95E7", - "vfs_type": "vfat", -diff --git a/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json -index af2a3457c..762209754 100644 ---- a/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_86-x86_64-qcow2_customize-boot.json -@@ -2497,15 +2497,15 @@ - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/opt", -+ "path": "/boot", - "options": "defaults" - }, - { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/opt", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_87-aarch64-ami-boot.json b/test/data/manifests/rhel_87-aarch64-ami-boot.json -index a35807b30..aae84ddb4 100644 ---- a/test/data/manifests/rhel_87-aarch64-ami-boot.json -+++ b/test/data/manifests/rhel_87-aarch64-ami-boot.json -@@ -2239,15 +2239,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_87-aarch64-ec2-boot.json b/test/data/manifests/rhel_87-aarch64-ec2-boot.json -index 66debbde6..37ce166ff 100644 ---- a/test/data/manifests/rhel_87-aarch64-ec2-boot.json -+++ b/test/data/manifests/rhel_87-aarch64-ec2-boot.json -@@ -2255,15 +2255,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_87-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_87-aarch64-qcow2_customize-boot.json -index 459bd7472..aef32364f 100644 ---- a/test/data/manifests/rhel_87-aarch64-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_87-aarch64-qcow2_customize-boot.json -@@ -2458,15 +2458,15 @@ - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/opt", -+ "path": "/boot", - "options": "defaults" - }, - { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/opt", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_87-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_87-ppc64le-qcow2_customize-boot.json -index cc63c4335..772f9b489 100644 ---- a/test/data/manifests/rhel_87-ppc64le-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_87-ppc64le-qcow2_customize-boot.json -@@ -2611,15 +2611,15 @@ - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/opt", -+ "path": "/boot", - "options": "defaults" - }, - { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/opt", - "options": "defaults" - } - ] -diff --git a/test/data/manifests/rhel_87-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_87-s390x-qcow2_customize-boot.json -index 8dbdcc94b..97fb5a1eb 100644 ---- a/test/data/manifests/rhel_87-s390x-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_87-s390x-qcow2_customize-boot.json -@@ -2708,15 +2708,15 @@ - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/opt", -+ "path": "/boot", - "options": "defaults" - }, - { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/opt", - "options": "defaults" - } - ] -diff --git a/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json -index ed1ab4479..30502377f 100644 ---- a/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json -+++ b/test/data/manifests/rhel_87-x86_64-azure_rhui-boot.json -@@ -2974,9 +2974,9 @@ - "options": { - "filesystems": [ - { -- "uuid": "f83b8e88-3bbf-457a-ab99-c5b252c7429c", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/var", -+ "path": "/", - "options": "defaults" - }, - { -@@ -2991,12 +2991,6 @@ - "path": "/home", - "options": "defaults" - }, -- { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -- "vfs_type": "xfs", -- "path": "/", -- "options": "defaults" -- }, - { - "uuid": "a178892e-e285-4ce1-9114-55780875d64e", - "vfs_type": "xfs", -@@ -3009,6 +3003,12 @@ - "path": "/usr", - "options": "defaults" - }, -+ { -+ "uuid": "f83b8e88-3bbf-457a-ab99-c5b252c7429c", -+ "vfs_type": "xfs", -+ "path": "/var", -+ "options": "defaults" -+ }, - { - "uuid": "7B77-95E7", - "vfs_type": "vfat", -diff --git a/test/data/manifests/rhel_87-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_87-x86_64-qcow2_customize-boot.json -index b06069625..bea677832 100644 ---- a/test/data/manifests/rhel_87-x86_64-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_87-x86_64-qcow2_customize-boot.json -@@ -2497,15 +2497,15 @@ - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/opt", -+ "path": "/boot", - "options": "defaults" - }, - { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/opt", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-aarch64-ami-boot.json b/test/data/manifests/rhel_90-aarch64-ami-boot.json -index c9938f785..97ca58cca 100644 ---- a/test/data/manifests/rhel_90-aarch64-ami-boot.json -+++ b/test/data/manifests/rhel_90-aarch64-ami-boot.json -@@ -2127,15 +2127,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-aarch64-ec2-boot.json b/test/data/manifests/rhel_90-aarch64-ec2-boot.json -index 9d03c0200..5f599126c 100644 ---- a/test/data/manifests/rhel_90-aarch64-ec2-boot.json -+++ b/test/data/manifests/rhel_90-aarch64-ec2-boot.json -@@ -2146,15 +2146,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-aarch64-openstack-boot.json b/test/data/manifests/rhel_90-aarch64-openstack-boot.json -index d82ad98a2..7e5c39d8a 100644 ---- a/test/data/manifests/rhel_90-aarch64-openstack-boot.json -+++ b/test/data/manifests/rhel_90-aarch64-openstack-boot.json -@@ -2029,15 +2029,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json -index e6bdf52db..55d3842ac 100644 ---- a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json -+++ b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json -@@ -2078,15 +2078,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json -index ac82ac613..7a59c46f0 100644 ---- a/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json -@@ -2243,15 +2243,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json -index 57108772b..a3669fcc5 100644 ---- a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json -+++ b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json -@@ -2267,15 +2267,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - } - ] -diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json -index e0e2e0217..cc63042ee 100644 ---- a/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json -@@ -2432,15 +2432,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-s390x-qcow2-boot.json b/test/data/manifests/rhel_90-s390x-qcow2-boot.json -index 46e90ffbf..e6aea9d19 100644 ---- a/test/data/manifests/rhel_90-s390x-qcow2-boot.json -+++ b/test/data/manifests/rhel_90-s390x-qcow2-boot.json -@@ -2525,15 +2525,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - } - ] -diff --git a/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json -index 81237a27f..338a3c9aa 100644 ---- a/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json -@@ -2690,15 +2690,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-x86_64-ami-boot.json b/test/data/manifests/rhel_90-x86_64-ami-boot.json -index 5169a2d1c..5e6843ad6 100644 ---- a/test/data/manifests/rhel_90-x86_64-ami-boot.json -+++ b/test/data/manifests/rhel_90-x86_64-ami-boot.json -@@ -2085,15 +2085,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json -index 4887364bf..a6e611861 100644 ---- a/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json -+++ b/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json -@@ -2827,9 +2827,9 @@ - "options": { - "filesystems": [ - { -- "uuid": "f83b8e88-3bbf-457a-ab99-c5b252c7429c", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/var", -+ "path": "/", - "options": "defaults" - }, - { -@@ -2844,12 +2844,6 @@ - "path": "/home", - "options": "defaults" - }, -- { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -- "vfs_type": "xfs", -- "path": "/", -- "options": "defaults" -- }, - { - "uuid": "a178892e-e285-4ce1-9114-55780875d64e", - "vfs_type": "xfs", -@@ -2862,6 +2856,12 @@ - "path": "/usr", - "options": "defaults" - }, -+ { -+ "uuid": "f83b8e88-3bbf-457a-ab99-c5b252c7429c", -+ "vfs_type": "xfs", -+ "path": "/var", -+ "options": "defaults" -+ }, - { - "uuid": "7B77-95E7", - "vfs_type": "vfat", -diff --git a/test/data/manifests/rhel_90-x86_64-ec2-boot.json b/test/data/manifests/rhel_90-x86_64-ec2-boot.json -index e94e820e6..1304d42b1 100644 ---- a/test/data/manifests/rhel_90-x86_64-ec2-boot.json -+++ b/test/data/manifests/rhel_90-x86_64-ec2-boot.json -@@ -2106,15 +2106,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json -index ca7890825..0aa4b2658 100644 ---- a/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json -+++ b/test/data/manifests/rhel_90-x86_64-ec2_ha-boot.json -@@ -2678,15 +2678,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json -index 73ed7859b..a6702dce3 100644 ---- a/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json -+++ b/test/data/manifests/rhel_90-x86_64-ec2_sap-boot.json -@@ -3661,15 +3661,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-x86_64-gce-boot.json b/test/data/manifests/rhel_90-x86_64-gce-boot.json -index 1119d6c0a..26530bb18 100644 ---- a/test/data/manifests/rhel_90-x86_64-gce-boot.json -+++ b/test/data/manifests/rhel_90-x86_64-gce-boot.json -@@ -2177,15 +2177,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json -index c60c2ba91..abb35615d 100644 ---- a/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json -+++ b/test/data/manifests/rhel_90-x86_64-gce_rhui-boot.json -@@ -2183,15 +2183,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-x86_64-oci-boot.json b/test/data/manifests/rhel_90-x86_64-oci-boot.json -index 63d58a0af..5cd8fd4f8 100644 ---- a/test/data/manifests/rhel_90-x86_64-oci-boot.json -+++ b/test/data/manifests/rhel_90-x86_64-oci-boot.json -@@ -2117,15 +2117,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-x86_64-openstack-boot.json b/test/data/manifests/rhel_90-x86_64-openstack-boot.json -index 02a9566b3..530e84fd1 100644 ---- a/test/data/manifests/rhel_90-x86_64-openstack-boot.json -+++ b/test/data/manifests/rhel_90-x86_64-openstack-boot.json -@@ -2131,15 +2131,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json -index 4451f1b38..1dd250098 100644 ---- a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json -+++ b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json -@@ -2138,15 +2138,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json -index d8456a485..eaec1aedd 100644 ---- a/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_90-x86_64-qcow2_customize-boot.json -@@ -2339,15 +2339,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-x86_64-vhd-boot.json b/test/data/manifests/rhel_90-x86_64-vhd-boot.json -index 49177d3fd..4910da83e 100644 ---- a/test/data/manifests/rhel_90-x86_64-vhd-boot.json -+++ b/test/data/manifests/rhel_90-x86_64-vhd-boot.json -@@ -2117,15 +2117,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_90-x86_64-vmdk-boot.json b/test/data/manifests/rhel_90-x86_64-vmdk-boot.json -index 41fc68dd0..1e05d195c 100644 ---- a/test/data/manifests/rhel_90-x86_64-vmdk-boot.json -+++ b/test/data/manifests/rhel_90-x86_64-vmdk-boot.json -@@ -2131,15 +2131,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-aarch64-ami-boot.json b/test/data/manifests/rhel_91-aarch64-ami-boot.json -index afcbb094d..03e4d7089 100644 ---- a/test/data/manifests/rhel_91-aarch64-ami-boot.json -+++ b/test/data/manifests/rhel_91-aarch64-ami-boot.json -@@ -5228,15 +5228,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-aarch64-ec2-boot.json b/test/data/manifests/rhel_91-aarch64-ec2-boot.json -index 1075fda5f..a7118289e 100644 ---- a/test/data/manifests/rhel_91-aarch64-ec2-boot.json -+++ b/test/data/manifests/rhel_91-aarch64-ec2-boot.json -@@ -5258,15 +5258,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-aarch64-openstack-boot.json b/test/data/manifests/rhel_91-aarch64-openstack-boot.json -index 8ef4aab45..f1b1213b4 100644 ---- a/test/data/manifests/rhel_91-aarch64-openstack-boot.json -+++ b/test/data/manifests/rhel_91-aarch64-openstack-boot.json -@@ -5165,15 +5165,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-aarch64-qcow2-boot.json b/test/data/manifests/rhel_91-aarch64-qcow2-boot.json -index 094765f2a..05e9d44a0 100644 ---- a/test/data/manifests/rhel_91-aarch64-qcow2-boot.json -+++ b/test/data/manifests/rhel_91-aarch64-qcow2-boot.json -@@ -5296,15 +5296,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-aarch64-qcow2_customize-boot.json b/test/data/manifests/rhel_91-aarch64-qcow2_customize-boot.json -index 6f2b6cd43..713534831 100644 ---- a/test/data/manifests/rhel_91-aarch64-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_91-aarch64-qcow2_customize-boot.json -@@ -5549,15 +5549,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_91-ppc64le-qcow2-boot.json -index 8edeb3ec7..57736311e 100644 ---- a/test/data/manifests/rhel_91-ppc64le-qcow2-boot.json -+++ b/test/data/manifests/rhel_91-ppc64le-qcow2-boot.json -@@ -5800,15 +5800,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - } - ] -diff --git a/test/data/manifests/rhel_91-ppc64le-qcow2_customize-boot.json b/test/data/manifests/rhel_91-ppc64le-qcow2_customize-boot.json -index 623db8433..30f6be9d9 100644 ---- a/test/data/manifests/rhel_91-ppc64le-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_91-ppc64le-qcow2_customize-boot.json -@@ -6053,15 +6053,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-s390x-qcow2-boot.json b/test/data/manifests/rhel_91-s390x-qcow2-boot.json -index e09b42751..b77433993 100644 ---- a/test/data/manifests/rhel_91-s390x-qcow2-boot.json -+++ b/test/data/manifests/rhel_91-s390x-qcow2-boot.json -@@ -6488,15 +6488,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - } - ] -diff --git a/test/data/manifests/rhel_91-s390x-qcow2_customize-boot.json b/test/data/manifests/rhel_91-s390x-qcow2_customize-boot.json -index 0367fc572..68fe6c299 100644 ---- a/test/data/manifests/rhel_91-s390x-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_91-s390x-qcow2_customize-boot.json -@@ -6741,15 +6741,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-x86_64-ami-boot.json b/test/data/manifests/rhel_91-x86_64-ami-boot.json -index 6cc89bd5b..e16e8cecc 100644 ---- a/test/data/manifests/rhel_91-x86_64-ami-boot.json -+++ b/test/data/manifests/rhel_91-x86_64-ami-boot.json -@@ -5096,15 +5096,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json -index 475a87c69..79f1e053d 100644 ---- a/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json -+++ b/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json -@@ -7013,9 +7013,9 @@ - "options": { - "filesystems": [ - { -- "uuid": "f83b8e88-3bbf-457a-ab99-c5b252c7429c", -+ "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", - "vfs_type": "xfs", -- "path": "/var", -+ "path": "/", - "options": "defaults" - }, - { -@@ -7030,12 +7030,6 @@ - "path": "/home", - "options": "defaults" - }, -- { -- "uuid": "fb180daf-48a7-4ee0-b10d-394651850fd4", -- "vfs_type": "xfs", -- "path": "/", -- "options": "defaults" -- }, - { - "uuid": "a178892e-e285-4ce1-9114-55780875d64e", - "vfs_type": "xfs", -@@ -7048,6 +7042,12 @@ - "path": "/usr", - "options": "defaults" - }, -+ { -+ "uuid": "f83b8e88-3bbf-457a-ab99-c5b252c7429c", -+ "vfs_type": "xfs", -+ "path": "/var", -+ "options": "defaults" -+ }, - { - "uuid": "7B77-95E7", - "vfs_type": "vfat", -diff --git a/test/data/manifests/rhel_91-x86_64-ec2-boot.json b/test/data/manifests/rhel_91-x86_64-ec2-boot.json -index 50ca74834..02df69343 100644 ---- a/test/data/manifests/rhel_91-x86_64-ec2-boot.json -+++ b/test/data/manifests/rhel_91-x86_64-ec2-boot.json -@@ -5128,15 +5128,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-x86_64-ec2_ha-boot.json b/test/data/manifests/rhel_91-x86_64-ec2_ha-boot.json -index 7cc538b5a..5f459547f 100644 ---- a/test/data/manifests/rhel_91-x86_64-ec2_ha-boot.json -+++ b/test/data/manifests/rhel_91-x86_64-ec2_ha-boot.json -@@ -6636,15 +6636,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-x86_64-ec2_sap-boot.json b/test/data/manifests/rhel_91-x86_64-ec2_sap-boot.json -index 42b3e1a0c..7ea4bfc11 100644 ---- a/test/data/manifests/rhel_91-x86_64-ec2_sap-boot.json -+++ b/test/data/manifests/rhel_91-x86_64-ec2_sap-boot.json -@@ -9071,15 +9071,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-x86_64-gce-boot.json b/test/data/manifests/rhel_91-x86_64-gce-boot.json -index 1def09536..2f39df2c1 100644 ---- a/test/data/manifests/rhel_91-x86_64-gce-boot.json -+++ b/test/data/manifests/rhel_91-x86_64-gce-boot.json -@@ -5344,15 +5344,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json b/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json -index 4033198b1..27c561a53 100644 ---- a/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json -+++ b/test/data/manifests/rhel_91-x86_64-gce_rhui-boot.json -@@ -5350,15 +5350,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-x86_64-oci-boot.json b/test/data/manifests/rhel_91-x86_64-oci-boot.json -index 73cbbeee2..3834e148b 100644 ---- a/test/data/manifests/rhel_91-x86_64-oci-boot.json -+++ b/test/data/manifests/rhel_91-x86_64-oci-boot.json -@@ -5435,15 +5435,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-x86_64-openstack-boot.json b/test/data/manifests/rhel_91-x86_64-openstack-boot.json -index b81d2b812..d2632e2f0 100644 ---- a/test/data/manifests/rhel_91-x86_64-openstack-boot.json -+++ b/test/data/manifests/rhel_91-x86_64-openstack-boot.json -@@ -5437,15 +5437,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-x86_64-qcow2-boot.json b/test/data/manifests/rhel_91-x86_64-qcow2-boot.json -index 2486cd97e..f25594cb8 100644 ---- a/test/data/manifests/rhel_91-x86_64-qcow2-boot.json -+++ b/test/data/manifests/rhel_91-x86_64-qcow2-boot.json -@@ -5456,15 +5456,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-x86_64-qcow2_customize-boot.json b/test/data/manifests/rhel_91-x86_64-qcow2_customize-boot.json -index 908d9f3df..52a3bd60d 100644 ---- a/test/data/manifests/rhel_91-x86_64-qcow2_customize-boot.json -+++ b/test/data/manifests/rhel_91-x86_64-qcow2_customize-boot.json -@@ -5805,15 +5805,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-x86_64-vhd-boot.json b/test/data/manifests/rhel_91-x86_64-vhd-boot.json -index 59b177614..89897f1fc 100644 ---- a/test/data/manifests/rhel_91-x86_64-vhd-boot.json -+++ b/test/data/manifests/rhel_91-x86_64-vhd-boot.json -@@ -5383,15 +5383,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { -diff --git a/test/data/manifests/rhel_91-x86_64-vmdk-boot.json b/test/data/manifests/rhel_91-x86_64-vmdk-boot.json -index 9402b535a..1fa27f84d 100644 ---- a/test/data/manifests/rhel_91-x86_64-vmdk-boot.json -+++ b/test/data/manifests/rhel_91-x86_64-vmdk-boot.json -@@ -5437,15 +5437,15 @@ - "options": { - "filesystems": [ - { -- "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", -+ "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "vfs_type": "xfs", -- "path": "/boot", -+ "path": "/", - "options": "defaults" - }, - { -- "uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", -+ "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "vfs_type": "xfs", -- "path": "/", -+ "path": "/boot", - "options": "defaults" - }, - { --- -2.35.3 - diff --git a/0003-dbjobqueue-fix-bad-errors.As-usages.patch b/0003-dbjobqueue-fix-bad-errors.As-usages.patch deleted file mode 100644 index 3a916ee..0000000 --- a/0003-dbjobqueue-fix-bad-errors.As-usages.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 9def5455708f7e247fe4103d47e00a7beb52169b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Budai?= -Date: Wed, 27 Jul 2022 13:35:08 +0200 -Subject: [PATCH 3/7] dbjobqueue: fix bad errors.As usages -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -errors.As is meant to check whether err (or other error in its chain) can -be assigned to the value that target is pointing at. - -Let's consider this example: - -errors.As(err, &pgx.ErrNoRows) - -pgx.ErrNoRows (and pgx.ErrTxClosed) is typed as error, thus in all -errors.As calls, the target is typed as *error. Err is always an error. -So this call is basically asking whether error can be assigned to error. -If err != nil, this is always true, thus this check doesn't make any sense -over a plain err != nil. - -Go 1.19 now checks this issue and if it's found, it refuses to compile the -code, see: - -https://go-review.googlesource.com/c/tools/+/339889 - -This commit changes usages of errors.As() to errors.Is(). The Is() method -doesn't check assignability but equality (the only different between Is() -and a plain old == operator is that Is() also inspects the whole error chain). - -This fixes the check because now, we are basically checking if err (or -any other error in its chain) == pgx.ErrTxClosed which is exactly what we -want. - -Signed-off-by: Ondřej Budai ---- - pkg/jobqueue/dbjobqueue/dbjobqueue.go | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/pkg/jobqueue/dbjobqueue/dbjobqueue.go b/pkg/jobqueue/dbjobqueue/dbjobqueue.go -index 4c1e60105..25231224f 100644 ---- a/pkg/jobqueue/dbjobqueue/dbjobqueue.go -+++ b/pkg/jobqueue/dbjobqueue/dbjobqueue.go -@@ -18,6 +18,7 @@ import ( - "github.com/jackc/pgtype" - "github.com/jackc/pgx/v4" - "github.com/jackc/pgx/v4/pgxpool" -+ - "github.com/osbuild/osbuild-composer/pkg/jobqueue" - - logrus "github.com/sirupsen/logrus" -@@ -229,7 +230,7 @@ func (q *DBJobQueue) Enqueue(jobType string, args interface{}, dependencies []uu - } - defer func() { - err := tx.Rollback(context.Background()) -- if err != nil && !errors.As(err, &pgx.ErrTxClosed) { -+ if err != nil && !errors.Is(err, pgx.ErrTxClosed) { - logrus.Error("error rolling back enqueue transaction: ", err) - } - }() -@@ -283,7 +284,7 @@ func (q *DBJobQueue) Dequeue(ctx context.Context, jobTypes []string, channels [] - if err == nil { - break - } -- if err != nil && !errors.As(err, &pgx.ErrNoRows) { -+ if err != nil && !errors.Is(err, pgx.ErrNoRows) { - return uuid.Nil, uuid.Nil, nil, "", nil, fmt.Errorf("error dequeuing job: %v", err) - } - -@@ -384,7 +385,7 @@ func (q *DBJobQueue) FinishJob(id uuid.UUID, result interface{}) error { - } - defer func() { - err = tx.Rollback(context.Background()) -- if err != nil && !errors.As(err, &pgx.ErrTxClosed) { -+ if err != nil && !errors.Is(err, pgx.ErrTxClosed) { - logrus.Errorf("error rolling back finish job transaction for job %s: %v", id, err) - } - --- -2.35.3 - diff --git a/osbuild-composer.spec b/osbuild-composer.spec index 1ddb3cb..faffd34 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -7,9 +7,12 @@ # This is used internally during nightly pipeline testing! %bcond_with relax_requires +# The minimum required osbuild version +%global min_osbuild_version 116 + %global goipath github.com/osbuild/osbuild-composer -Version: 100 +Version: 106 %gometa @@ -22,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients. } Name: osbuild-composer -Release: 2%{?dist} +Release: 1%{?dist} Summary: An image building service based on osbuild # osbuild-composer doesn't have support for building i686 and armv7hl images @@ -51,214 +54,6 @@ BuildRequires: git BuildRequires: btrfs-progs-devel # DO NOT REMOVE the BUNDLE_START and BUNDLE_END markers as they are used by 'tools/rpm_spec_add_provides_bundle.sh' to generate the Provides: bundled list # BUNDLE_START -Provides: bundled(golang(cloud.google.com/go)) = 0.112.0 -Provides: bundled(golang(cloud.google.com/go/compute)) = 1.23.4 -Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.2.3 -Provides: bundled(golang(cloud.google.com/go/iam)) = 1.1.5 -Provides: bundled(golang(cloud.google.com/go/storage)) = 1.37.0 -Provides: bundled(golang(dario.cat/mergo)) = 1.0.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go)) = 68.0.0+incompatible -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azcore)) = 1.9.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity)) = 1.5.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/internal)) = 1.5.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5)) = 5.5.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources)) = 1.2.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage)) = 1.5.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob)) = 1.2.1 -Provides: bundled(golang(github.com/Azure/go-autorest)) = 14.2.0+incompatible -Provides: bundled(golang(github.com/Azure/go-autorest/autorest)) = 0.11.29 -Provides: bundled(golang(github.com/Azure/go-autorest/autorest/adal)) = 0.9.22 -Provides: bundled(golang(github.com/Azure/go-autorest/autorest/azure/auth)) = 0.5.12 -Provides: bundled(golang(github.com/Azure/go-autorest/autorest/azure/cli)) = 0.4.6 -Provides: bundled(golang(github.com/Azure/go-autorest/autorest/date)) = 0.3.0 -Provides: bundled(golang(github.com/Azure/go-autorest/autorest/to)) = 0.4.0 -Provides: bundled(golang(github.com/Azure/go-autorest/autorest/validation)) = 0.3.1 -Provides: bundled(golang(github.com/Azure/go-autorest/logger)) = 0.2.1 -Provides: bundled(golang(github.com/Azure/go-autorest/tracing)) = 0.6.0 -Provides: bundled(golang(github.com/AzureAD/microsoft-authentication-library-for-go)) = 1.2.1 -Provides: bundled(golang(github.com/BurntSushi/toml)) = 1.3.2 -Provides: bundled(golang(github.com/Microsoft/go-winio)) = 0.6.1 -Provides: bundled(golang(github.com/Microsoft/hcsshim)) = 0.12.0-rc.1 -Provides: bundled(golang(github.com/VividCortex/ewma)) = 1.2.0 -Provides: bundled(golang(github.com/acarl005/stripansi)) = 5a71ef0 -Provides: bundled(golang(github.com/asaskevich/govalidator)) = a9d515a -Provides: bundled(golang(github.com/aws/aws-sdk-go)) = 1.50.9 -Provides: bundled(golang(github.com/aymerick/douceur)) = 0.2.0 -Provides: bundled(golang(github.com/beorn7/perks)) = 1.0.1 -Provides: bundled(golang(github.com/cenkalti/backoff/v4)) = 4.2.1 -Provides: bundled(golang(github.com/cespare/xxhash/v2)) = 2.2.0 -Provides: bundled(golang(github.com/containerd/cgroups/v3)) = 3.0.2 -Provides: bundled(golang(github.com/containerd/containerd)) = 1.7.9 -Provides: bundled(golang(github.com/containerd/stargz-snapshotter/estargz)) = 0.15.1 -Provides: bundled(golang(github.com/containers/common)) = 0.57.4 -Provides: bundled(golang(github.com/containers/image/v5)) = 5.29.2 -Provides: bundled(golang(github.com/containers/libtrust)) = c1716e8 -Provides: bundled(golang(github.com/containers/ocicrypt)) = 1.1.9 -Provides: bundled(golang(github.com/containers/storage)) = 1.51.0 -Provides: bundled(golang(github.com/coreos/go-semver)) = 0.3.1 -Provides: bundled(golang(github.com/coreos/go-systemd)) = d3cd4ed -Provides: bundled(golang(github.com/cyberphone/json-canonicalization)) = 785e297 -Provides: bundled(golang(github.com/cyphar/filepath-securejoin)) = 0.2.4 -Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1 -Provides: bundled(golang(github.com/deepmap/oapi-codegen)) = 1.8.2 -Provides: bundled(golang(github.com/dimchansky/utfbom)) = 1.1.1 -Provides: bundled(golang(github.com/distribution/reference)) = 0.5.0 -Provides: bundled(golang(github.com/docker/distribution)) = 2.8.3+incompatible -Provides: bundled(golang(github.com/docker/docker)) = 24.0.7+incompatible -Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = 0.8.0 -Provides: bundled(golang(github.com/docker/go-connections)) = 0.4.0 -Provides: bundled(golang(github.com/docker/go-units)) = 0.5.0 -Provides: bundled(golang(github.com/dougm/pretty)) = 2ee9d74 -Provides: bundled(golang(github.com/felixge/httpsnoop)) = 1.0.4 -Provides: bundled(golang(github.com/getkin/kin-openapi)) = 0.93.0 -Provides: bundled(golang(github.com/ghodss/yaml)) = 1.0.0 -Provides: bundled(golang(github.com/go-jose/go-jose/v3)) = 3.0.1 -Provides: bundled(golang(github.com/go-logr/logr)) = 1.4.1 -Provides: bundled(golang(github.com/go-logr/stdr)) = 1.2.2 -Provides: bundled(golang(github.com/go-openapi/analysis)) = 0.21.4 -Provides: bundled(golang(github.com/go-openapi/errors)) = 0.20.4 -Provides: bundled(golang(github.com/go-openapi/jsonpointer)) = 0.19.6 -Provides: bundled(golang(github.com/go-openapi/jsonreference)) = 0.20.2 -Provides: bundled(golang(github.com/go-openapi/loads)) = 0.21.2 -Provides: bundled(golang(github.com/go-openapi/runtime)) = 0.26.0 -Provides: bundled(golang(github.com/go-openapi/spec)) = 0.20.9 -Provides: bundled(golang(github.com/go-openapi/strfmt)) = 0.21.7 -Provides: bundled(golang(github.com/go-openapi/swag)) = 0.22.4 -Provides: bundled(golang(github.com/go-openapi/validate)) = 0.22.1 -Provides: bundled(golang(github.com/gobwas/glob)) = 0.2.3 -Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.2 -Provides: bundled(golang(github.com/golang-jwt/jwt)) = 3.2.2+incompatible -Provides: bundled(golang(github.com/golang-jwt/jwt/v4)) = 4.5.0 -Provides: bundled(golang(github.com/golang-jwt/jwt/v5)) = 5.2.0 -Provides: bundled(golang(github.com/golang/glog)) = 1.1.2 -Provides: bundled(golang(github.com/golang/groupcache)) = 41bb18b -Provides: bundled(golang(github.com/golang/protobuf)) = 1.5.3 -Provides: bundled(golang(github.com/google/go-cmp)) = 0.6.0 -Provides: bundled(golang(github.com/google/go-containerregistry)) = 0.16.1 -Provides: bundled(golang(github.com/google/go-intervals)) = 0.0.2 -Provides: bundled(golang(github.com/google/s2a-go)) = 0.1.7 -Provides: bundled(golang(github.com/google/uuid)) = 1.6.0 -Provides: bundled(golang(github.com/googleapis/enterprise-certificate-proxy)) = 0.3.2 -Provides: bundled(golang(github.com/googleapis/gax-go/v2)) = 2.12.0 -Provides: bundled(golang(github.com/gophercloud/gophercloud)) = 1.8.0 -Provides: bundled(golang(github.com/gorilla/css)) = 1.0.0 -Provides: bundled(golang(github.com/gorilla/mux)) = 1.8.0 -Provides: bundled(golang(github.com/hashicorp/errwrap)) = 1.1.0 -Provides: bundled(golang(github.com/hashicorp/go-cleanhttp)) = 0.5.2 -Provides: bundled(golang(github.com/hashicorp/go-multierror)) = 1.1.1 -Provides: bundled(golang(github.com/hashicorp/go-retryablehttp)) = 0.7.5 -Provides: bundled(golang(github.com/hashicorp/go-version)) = 1.6.0 -Provides: bundled(golang(github.com/inconshreveable/mousetrap)) = 1.1.0 -Provides: bundled(golang(github.com/jackc/chunkreader/v2)) = 2.0.1 -Provides: bundled(golang(github.com/jackc/pgconn)) = 1.14.0 -Provides: bundled(golang(github.com/jackc/pgio)) = 1.0.0 -Provides: bundled(golang(github.com/jackc/pgpassfile)) = 1.0.0 -Provides: bundled(golang(github.com/jackc/pgproto3/v2)) = 2.3.2 -Provides: bundled(golang(github.com/jackc/pgservicefile)) = 091c0ba -Provides: bundled(golang(github.com/jackc/pgtype)) = 1.14.1 -Provides: bundled(golang(github.com/jackc/pgx/v4)) = 4.18.1 -Provides: bundled(golang(github.com/jackc/puddle)) = 1.3.0 -Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 0.4.0 -Provides: bundled(golang(github.com/josharian/intern)) = 1.0.0 -Provides: bundled(golang(github.com/json-iterator/go)) = 1.1.12 -Provides: bundled(golang(github.com/julienschmidt/httprouter)) = 1.3.0 -Provides: bundled(golang(github.com/klauspost/compress)) = 1.17.3 -Provides: bundled(golang(github.com/klauspost/pgzip)) = 1.2.6 -Provides: bundled(golang(github.com/kolo/xmlrpc)) = 38db28d -Provides: bundled(golang(github.com/kr/text)) = 0.2.0 -Provides: bundled(golang(github.com/kylelemons/godebug)) = 1.1.0 -Provides: bundled(golang(github.com/labstack/echo/v4)) = 4.11.4 -Provides: bundled(golang(github.com/labstack/gommon)) = 0.4.2 -Provides: bundled(golang(github.com/letsencrypt/boulder)) = fdfea0d -Provides: bundled(golang(github.com/mailru/easyjson)) = 0.7.7 -Provides: bundled(golang(github.com/mattn/go-colorable)) = 0.1.13 -Provides: bundled(golang(github.com/mattn/go-isatty)) = 0.0.20 -Provides: bundled(golang(github.com/mattn/go-runewidth)) = 0.0.15 -Provides: bundled(golang(github.com/mattn/go-shellwords)) = 1.0.12 -Provides: bundled(golang(github.com/mattn/go-sqlite3)) = 1.14.18 -Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions/v2)) = 2.0.0 -Provides: bundled(golang(github.com/microcosm-cc/bluemonday)) = 1.0.18 -Provides: bundled(golang(github.com/miekg/pkcs11)) = 1.1.1 -Provides: bundled(golang(github.com/mistifyio/go-zfs/v3)) = 3.0.1 -Provides: bundled(golang(github.com/mitchellh/go-homedir)) = 1.1.0 -Provides: bundled(golang(github.com/mitchellh/mapstructure)) = 1.5.0 -Provides: bundled(golang(github.com/moby/sys/mountinfo)) = 0.7.1 -Provides: bundled(golang(github.com/modern-go/concurrent)) = bacd9c7 -Provides: bundled(golang(github.com/modern-go/reflect2)) = 1.0.2 -Provides: bundled(golang(github.com/oklog/ulid)) = 1.3.1 -Provides: bundled(golang(github.com/opencontainers/go-digest)) = 1.0.0 -Provides: bundled(golang(github.com/opencontainers/image-spec)) = 1.1.0-rc5 -Provides: bundled(golang(github.com/opencontainers/runc)) = 1.1.10 -Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = 1.1.0 -Provides: bundled(golang(github.com/opencontainers/selinux)) = 1.11.0 -Provides: bundled(golang(github.com/openshift-online/ocm-sdk-go)) = 0.1.398 -Provides: bundled(golang(github.com/oracle/oci-go-sdk/v54)) = 54.0.0 -Provides: bundled(golang(github.com/osbuild/images)) = 0.35.0 -Provides: bundled(golang(github.com/osbuild/osbuild-composer/pkg/splunk_logger)) = e969a9d -Provides: bundled(golang(github.com/osbuild/pulp-client)) = 0.1.0 -Provides: bundled(golang(github.com/ostreedev/ostree-go)) = 719684c -Provides: bundled(golang(github.com/pkg/browser)) = 5ac0b6a -Provides: bundled(golang(github.com/pkg/errors)) = 0.9.1 -Provides: bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0 -Provides: bundled(golang(github.com/proglottis/gpgme)) = 0.1.3 -Provides: bundled(golang(github.com/prometheus/client_golang)) = 1.18.0 -Provides: bundled(golang(github.com/prometheus/client_model)) = 0.5.0 -Provides: bundled(golang(github.com/prometheus/common)) = 0.45.0 -Provides: bundled(golang(github.com/prometheus/procfs)) = 0.12.0 -Provides: bundled(golang(github.com/rivo/uniseg)) = 0.4.4 -Provides: bundled(golang(github.com/secure-systems-lab/go-securesystemslib)) = 0.7.0 -Provides: bundled(golang(github.com/segmentio/ksuid)) = 1.0.4 -Provides: bundled(golang(github.com/sigstore/fulcio)) = 1.4.3 -Provides: bundled(golang(github.com/sigstore/rekor)) = 1.2.2 -Provides: bundled(golang(github.com/sigstore/sigstore)) = 1.7.5 -Provides: bundled(golang(github.com/sirupsen/logrus)) = 1.9.3 -Provides: bundled(golang(github.com/skratchdot/open-golang)) = eef8423 -Provides: bundled(golang(github.com/sony/gobreaker)) = dd874f9 -Provides: bundled(golang(github.com/spf13/cobra)) = 1.8.0 -Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.5 -Provides: bundled(golang(github.com/stefanberger/go-pkcs11uri)) = 78d3cae -Provides: bundled(golang(github.com/stretchr/testify)) = 1.8.4 -Provides: bundled(golang(github.com/sylabs/sif/v2)) = 2.15.0 -Provides: bundled(golang(github.com/syndtr/gocapability)) = 42c35b4 -Provides: bundled(golang(github.com/tchap/go-patricia/v2)) = 2.3.1 -Provides: bundled(golang(github.com/titanous/rocacheck)) = afe7314 -Provides: bundled(golang(github.com/ubccr/kerby)) = 201a958 -Provides: bundled(golang(github.com/ulikunitz/xz)) = 0.5.11 -Provides: bundled(golang(github.com/valyala/bytebufferpool)) = 1.0.0 -Provides: bundled(golang(github.com/valyala/fasttemplate)) = 1.2.2 -Provides: bundled(golang(github.com/vbatts/tar-split)) = 0.11.5 -Provides: bundled(golang(github.com/vbauerster/mpb/v8)) = 8.6.2 -Provides: bundled(golang(github.com/vmware/govmomi)) = 0.34.2 -Provides: bundled(golang(go.mongodb.org/mongo-driver)) = 1.11.3 -Provides: bundled(golang(go.mozilla.org/pkcs7)) = 33d0574 -Provides: bundled(golang(go.opencensus.io)) = 0.24.0 -Provides: bundled(golang(go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc)) = 0.47.0 -Provides: bundled(golang(go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp)) = 0.47.0 -Provides: bundled(golang(go.opentelemetry.io/otel)) = 1.22.0 -Provides: bundled(golang(go.opentelemetry.io/otel/metric)) = 1.22.0 -Provides: bundled(golang(go.opentelemetry.io/otel/trace)) = 1.22.0 -Provides: bundled(golang(golang.org/x/crypto)) = 0.18.0 -Provides: bundled(golang(golang.org/x/exp)) = 7918f67 -Provides: bundled(golang(golang.org/x/mod)) = 0.13.0 -Provides: bundled(golang(golang.org/x/net)) = 0.20.0 -Provides: bundled(golang(golang.org/x/oauth2)) = 0.16.0 -Provides: bundled(golang(golang.org/x/sync)) = 0.6.0 -Provides: bundled(golang(golang.org/x/sys)) = 0.16.0 -Provides: bundled(golang(golang.org/x/term)) = 0.16.0 -Provides: bundled(golang(golang.org/x/text)) = 0.14.0 -Provides: bundled(golang(golang.org/x/time)) = 0.5.0 -Provides: bundled(golang(golang.org/x/tools)) = 0.14.0 -Provides: bundled(golang(google.golang.org/api)) = 0.161.0 -Provides: bundled(golang(google.golang.org/appengine)) = 1.6.8 -Provides: bundled(golang(google.golang.org/genproto)) = a9fa171 -Provides: bundled(golang(google.golang.org/genproto/googleapis/api)) = 1f4bbc5 -Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc)) = a9fa171 -Provides: bundled(golang(google.golang.org/grpc)) = 1.61.0 -Provides: bundled(golang(google.golang.org/protobuf)) = 1.32.0 -Provides: bundled(golang(gopkg.in/go-jose/go-jose.v2)) = 2.6.1 -Provides: bundled(golang(gopkg.in/ini.v1)) = 1.67.0 -Provides: bundled(golang(gopkg.in/yaml.v2)) = 2.4.0 -Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 # BUNDLE_END %endif @@ -311,6 +106,8 @@ export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/comm %gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer %gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker +%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-manager %{goipath}/cmd/osbuild-jobsite-manager +%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-builder %{goipath}/cmd/osbuild-jobsite-builder make man @@ -345,7 +142,8 @@ go build -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _b install -m 0755 -vd %{buildroot}%{_libexecdir}/osbuild-composer install -m 0755 -vp _bin/osbuild-composer %{buildroot}%{_libexecdir}/osbuild-composer/ install -m 0755 -vp _bin/osbuild-worker %{buildroot}%{_libexecdir}/osbuild-composer/ -install -m 0755 -vp dnf-json %{buildroot}%{_libexecdir}/osbuild-composer/ +install -m 0755 -vp _bin/osbuild-jobsite-manager %{buildroot}%{_libexecdir}/osbuild-composer/ +install -m 0755 -vp _bin/osbuild-jobsite-builder %{buildroot}%{_libexecdir}/osbuild-composer/ # Only include repositories for the distribution and release install -m 0755 -vd %{buildroot}%{_datadir}/osbuild-composer/repositories @@ -502,7 +300,9 @@ cd $PWD/_build/src/%{goipath} %package core Summary: The core osbuild-composer binary -Requires: %{name}-dnf-json = %{version}-%{release} +Requires: osbuild-depsolve-dnf >= %{min_osbuild_version} +Provides: %{name}-dnf-json = %{version}-%{release} +Obsoletes: %{name}-dnf-json < %{version}-%{release} %description core The core osbuild-composer binary. This is suitable both for spawning in containers and by systemd. @@ -515,17 +315,21 @@ The core osbuild-composer binary. This is suitable both for spawning in containe Summary: The worker for osbuild-composer Requires: systemd Requires: qemu-img -Requires: osbuild >= 98 -Requires: osbuild-ostree >= 98 -Requires: osbuild-lvm2 >= 98 -Requires: osbuild-luks2 >= 98 -Requires: %{name}-dnf-json = %{version}-%{release} +Requires: osbuild >= %{min_osbuild_version} +Requires: osbuild-ostree >= %{min_osbuild_version} +Requires: osbuild-lvm2 >= %{min_osbuild_version} +Requires: osbuild-luks2 >= %{min_osbuild_version} +Requires: osbuild-depsolve-dnf >= %{min_osbuild_version} +Provides: %{name}-dnf-json = %{version}-%{release} +Obsoletes: %{name}-dnf-json < %{version}-%{release} %description worker The worker for osbuild-composer %files worker %{_libexecdir}/osbuild-composer/osbuild-worker +%{_libexecdir}/osbuild-composer/osbuild-jobsite-manager +%{_libexecdir}/osbuild-composer/osbuild-jobsite-builder %{_unitdir}/osbuild-worker@.service %{_unitdir}/osbuild-remote-worker@.service @@ -547,25 +351,6 @@ fi # restart all the worker services %systemd_postun_with_restart "osbuild-worker@*.service" "osbuild-remote-worker@*.service" -%package dnf-json -Summary: The dnf-json binary used by osbuild-composer and the workers - -# Conflicts with older versions of composer that provide the same files -# this can be removed when RHEL 8 reaches EOL -Conflicts: osbuild-composer <= 35 - -%description dnf-json -The dnf-json binary used by osbuild-composer and the workers. - -%files dnf-json -%{_libexecdir}/osbuild-composer/dnf-json - -%post dnf-json -# Fix ownership of the rpmmd cache files from previous versions where it was owned by root:root -if [ -e /var/cache/osbuild-composer/rpmmd ]; then - chown -f -R --from root:root _osbuild-composer:_osbuild-composer /var/cache/osbuild-composer/rpmmd -fi - %if %{with tests} || 0%{?rhel} %package tests @@ -637,6 +422,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Wed May 01 2024 imagebuilder-bot - 106-1 +- New upstream release + * Sun Feb 11 2024 Maxwell G - 100-2 - Rebuild for golang 1.22.0 diff --git a/sources b/sources index dafdd01..f660d04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osbuild-composer-100.tar.gz) = efe5e7592c01dfcc4513ecbf2b42050831d0c3b2a5837ab116507acbc46a0af50e5ef0ac189dbaf253cd8021f80c76ce7f592260ce909e2b2d04c0969037e96d +SHA512 (osbuild-composer-106.tar.gz) = 26ad7a27cf206feba3cd35f5c45ee9f8e96937aee75930e1f5cbd9aacbd3ccdca132895200636df65cbcedf5dd0c072804a967e608751a1bb3649c282372e083