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

distro/rhel86: add RHEL 8.5 variant

Browse source 
Define the distribution strings for RHEL 8.5 in distro/rhel86 and add
constructors.  Remove the old 8.5 from the distro registry and use the
new constructors.

Composer can now build RHEL 8.5 image-installer on aarch64, which wasn't
supported before.

RHEL 8.5 manifests have changed to minimise the differences from 8.6.
Some changes are fixes made in 8.6 but never backported to 8.5 because
of our (older) policy of not changing definitions after the release of a
distro.
Other changes are non-functional (e.g., stage or package order).

See the list below for the source of each change.

Manifest changes:
- Stage order changed for org.osbuild.systemd-logind and
  org.osbuild.rhsm.
- org.osbuild.grub2 options: config.default = "saved"
  Reverted 111cd8871f
- Partition sizes: RHEL 8.5 had extra arbitrarily sized padding for the
  header.  Now all partitions are sized to fit headers exactly.
  Original change at b7abef54e8.
- SELinux set to permissive in Anaconda.  This was changed in RHEL 8.6
  and 9.0 but never backported to 8.5.
  See a7fbe916b7.
- Installer isolevel set to 3.  Like above, this was changed in
  8.6 and 9.0.
  Original change at d8d161480e.
- Specify a remote for edge deployments.
  Original change at b18b4e80a0.
This commit is contained in:
Achilleas Koutsou 2022-06-29 14:12:05 +02:00 • committed by Christian Kellner
parent 56e6208fcf
commit 436d8f9b43
35 changed files with 44969 additions and 315 deletions
Download patch file Download diff file Expand all files Collapse all files

21
internal/distro/rhel86/distro.go
View file

@ -105,6 +105,18 @@ var defaultDistroImageConfig = &distro.ImageConfig{
// distribution objects without the arches > image types
var distroMap = map[string]distribution{
"rhel-85": {
name: "rhel-85",
product: "Red Hat Enterprise Linux",
osVersion: "8.5",
releaseVersion: "8",
modulePlatformID: "platform:el8",
vendor: "redhat",
ostreeRefTmpl: "rhel/8/%s/edge",
isolabelTmpl: "RHEL-8-5-0-BaseOS-%s",
runner: "org.osbuild.rhel85",
defaultImageConfig: defaultDistroImageConfig,
},
"rhel-86": {
name: "rhel-86",
product: "Red Hat Enterprise Linux",
@ -620,6 +632,15 @@ func NewHostDistro(name, modulePlatformID, ostreeRef string) distro.Distro {
return newDistro("rhel-86")
}
// New creates a new distro object, defining the supported architectures and image types
func NewRHEL85() distro.Distro {
return newDistro("rhel-85")
}
func NewRHEL85HostDistro(name, modulePlatformID, ostreeRef string) distro.Distro {
return newDistro("rhel-85")
}
// New creates a new distro object, defining the supported architectures and image types
func NewRHEL87() distro.Distro {
return newDistro("rhel-87")

3
internal/distroregistry/distroregistry.go
View file

@ -11,7 +11,6 @@ import (
"github.com/osbuild/osbuild-composer/internal/distro/rhel7"
"github.com/osbuild/osbuild-composer/internal/distro/rhel8"
"github.com/osbuild/osbuild-composer/internal/distro/rhel84"
"github.com/osbuild/osbuild-composer/internal/distro/rhel85"
"github.com/osbuild/osbuild-composer/internal/distro/rhel86"
"github.com/osbuild/osbuild-composer/internal/distro/rhel90"
"github.com/osbuild/osbuild-composer/internal/distro/rhel90beta"
@ -26,8 +25,8 @@ var supportedDistros = []supportedDistro{
{rhel7.New, rhel7.NewHostDistro},
{rhel8.New, rhel8.NewHostDistro},
{rhel84.New, rhel84.NewHostDistro},
{rhel85.New, rhel85.NewHostDistro},
{rhel86.New, rhel86.NewHostDistro},
{rhel86.NewRHEL85, rhel86.NewRHEL85HostDistro},
{rhel86.NewRHEL87, rhel86.NewRHEL87HostDistro},
{rhel86.NewCentos, rhel86.NewCentosHostDistro},
{rhel90beta.New, rhel90beta.NewHostDistro},

52
test/data/manifests/rhel_85-aarch64-ami-boot.json
View file

@ -2125,17 +2125,6 @@
"default_target": "multi-user.target"
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.sysconfig",
"options": {
@ -2162,6 +2151,27 @@
}
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.cloud-init",
"options": {
@ -2216,16 +2226,6 @@
"profile": "sssd"
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.sshd.config",
"options": {
@ -2270,7 +2270,9 @@
"vendor": "redhat"
},
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.aarch64",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2311,7 +2313,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19511196,
"size": 19511263,
"start": 1460224,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -2374,7 +2376,7 @@
"options": {
"filename": "image.raw",
"start": 1460224,
"size": 19511196,
"size": 19511263,
"lock": true
}
}
@ -2421,7 +2423,7 @@
"options": {
"filename": "image.raw",
"start": 1460224,
"size": 19511196
"size": 19511263
}
}
},

58
test/data/manifests/rhel_85-aarch64-ec2-boot.json
View file

@ -2138,17 +2138,6 @@
"default_target": "multi-user.target"
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.sysconfig",
"options": {
@ -2175,6 +2164,30 @@
}
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.cloud-init",
"options": {
@ -2229,19 +2242,6 @@
"profile": "sssd"
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.sshd.config",
"options": {
@ -2286,7 +2286,9 @@
"vendor": "redhat"
},
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.aarch64",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2327,7 +2329,7 @@
"uuid": "CB07C243-BC44-4717-853E-28852021225B"
},
{
"size": 19511196,
"size": 19511263,
"start": 1460224,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -2390,7 +2392,7 @@
"options": {
"filename": "image.raw",
"start": 1460224,
"size": 19511196,
"size": 19511263,
"lock": true
}
}
@ -2437,7 +2439,7 @@
"options": {
"filename": "image.raw",
"start": 1460224,
"size": 19511196
"size": 19511263
}
}
},

3
test/data/manifests/rhel_85-aarch64-edge_commit-boot.json
View file

@ -1945,7 +1945,8 @@
"enabled_services": [
"NetworkManager.service",
"firewalld.service",
"sshd.service"
"sshd.service",
"fdo-client-linuxapp.service"
]
}
},

3
test/data/manifests/rhel_85-aarch64-edge_container-boot.json
View file

@ -1945,7 +1945,8 @@
"enabled_services": [
"NetworkManager.service",
"firewalld.service",
"sshd.service"
"sshd.service",
"fdo-client-linuxapp.service"
]
}
},

27
test/data/manifests/rhel_85-aarch64-edge_installer-boot.json
View file

@ -3437,8 +3437,6 @@
"systemd-initrd",
"modsign",
"nss-softokn",
"rdma",
"rngd",
"i18n",
"convertfs",
"network-manager",
@ -3458,14 +3456,8 @@
"livenet",
"lvm",
"mdraid",
"multipath",
"qemu",
"qemu-net",
"fcoe",
"fcoe-uefi",
"iscsi",
"lunmask",
"nfs",
"resume",
"rootfs-block",
"terminfo",
@ -3478,12 +3470,26 @@
"img-lib",
"shutdown",
"uefi-lib",
"anaconda"
"anaconda",
"rdma",
"rngd",
"multipath",
"fcoe",
"fcoe-uefi",
"iscsi",
"lunmask",
"nfs"
],
"install": [
"/.buildstamp"
]
}
},
{
"type": "org.osbuild.selinux.config",
"options": {
"state": "permissive"
}
}
]
},
@ -3594,7 +3600,8 @@
"filename": "installer.iso",
"volid": "RHEL-8-5-0-BaseOS-aarch64",
"sysid": "LINUX",
"efi": "images/efiboot.img"
"efi": "images/efiboot.img",
"isolevel": 3
}
},
{

27
test/data/manifests/rhel_85-aarch64-edge_installer_with_users-boot.json
View file

@ -3437,8 +3437,6 @@
"systemd-initrd",
"modsign",
"nss-softokn",
"rdma",
"rngd",
"i18n",
"convertfs",
"network-manager",
@ -3458,14 +3456,8 @@
"livenet",
"lvm",
"mdraid",
"multipath",
"qemu",
"qemu-net",
"fcoe",
"fcoe-uefi",
"iscsi",
"lunmask",
"nfs",
"resume",
"rootfs-block",
"terminfo",
@ -3478,12 +3470,26 @@
"img-lib",
"shutdown",
"uefi-lib",
"anaconda"
"anaconda",
"rdma",
"rngd",
"multipath",
"fcoe",
"fcoe-uefi",
"iscsi",
"lunmask",
"nfs"
],
"install": [
"/.buildstamp"
]
}
},
{
"type": "org.osbuild.selinux.config",
"options": {
"state": "permissive"
}
}
]
},
@ -3594,7 +3600,8 @@
"filename": "installer.iso",
"volid": "RHEL-8-5-0-BaseOS-aarch64",
"sysid": "LINUX",
"efi": "images/efiboot.img"
"efi": "images/efiboot.img",
"isolevel": 3
}
},
{

22205
test/data/manifests/rhel_85-aarch64-image_installer-boot.json Normal file
View file

File diff suppressed because it is too large Load diff

22256
test/data/manifests/rhel_85-aarch64-image_installer_with_users-boot.json Normal file
View file

File diff suppressed because it is too large Load diff

10
test/data/manifests/rhel_85-aarch64-openstack-boot.json
View file

@ -2248,7 +2248,9 @@
"vendor": "redhat"
},
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.aarch64",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2283,7 +2285,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 8181660,
"size": 8181727,
"start": 206848,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -2329,7 +2331,7 @@
"options": {
"filename": "disk.img",
"start": 206848,
"size": 8181660,
"size": 8181727,
"lock": true
}
}
@ -2368,7 +2370,7 @@
"options": {
"filename": "disk.img",
"start": 206848,
"size": 8181660
"size": 8181727
}
}
},

10
test/data/manifests/rhel_85-aarch64-qcow2-boot.json
View file

@ -2240,7 +2240,9 @@
"vendor": "redhat"
},
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.aarch64",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2275,7 +2277,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 20764572,
"size": 20764639,
"start": 206848,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -2321,7 +2323,7 @@
"options": {
"filename": "disk.img",
"start": 206848,
"size": 20764572,
"size": 20764639,
"lock": true
}
}
@ -2360,7 +2362,7 @@
"options": {
"filename": "disk.img",
"start": 206848,
"size": 20764572
"size": 20764639
}
}
},

18
test/data/manifests/rhel_85-aarch64-qcow2_customize-boot.json
View file

@ -2495,7 +2495,9 @@
"vendor": "redhat"
},
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.aarch64",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2530,7 +2532,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 19715996,
"size": 19716063,
"start": 1255424,
"type": "E6D6D379-F507-44C2-A23C-238F2A3DF928",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -2577,7 +2579,7 @@
"options": {
"filename": "disk.img",
"start": 1255424,
"size": 19715996,
"size": 19716063,
"lock": true
}
}
@ -2619,7 +2621,7 @@
"options": {
"filename": "disk.img",
"start": 1255424,
"size": 19715996,
"size": 19716063,
"lock": true
}
}
@ -2643,7 +2645,7 @@
"options": {
"filename": "disk.img",
"start": 1255424,
"size": 19715996,
"size": 19716063,
"lock": true
}
}
@ -2667,7 +2669,7 @@
"options": {
"filename": "disk.img",
"start": 1255424,
"size": 19715996,
"size": 19716063,
"lock": true
}
}
@ -2738,7 +2740,7 @@
"options": {
"filename": "disk.img",
"start": 1255424,
"size": 19715996
"size": 19716063
}
},
"usr": {
@ -2800,7 +2802,7 @@
"options": {
"filename": "disk.img",
"start": 1255424,
"size": 19715996,
"size": 19716063,
"lock": true
}
}

10
test/data/manifests/rhel_85-ppc64le-qcow2-boot.json
View file

@ -2396,7 +2396,9 @@
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto",
"legacy": "powerpc-ieee1275",
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.ppc64le",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2431,7 +2433,7 @@
"type": "41"
},
{
"size": 20961180,
"size": 20961280,
"start": 10240
}
]
@ -2457,7 +2459,7 @@
"options": {
"filename": "disk.img",
"start": 10240,
"size": 20961180,
"size": 20961280,
"lock": true
}
}
@ -2488,7 +2490,7 @@
"options": {
"filename": "disk.img",
"start": 10240,
"size": 20961180
"size": 20961280
}
}
},

18
test/data/manifests/rhel_85-ppc64le-qcow2_customize-boot.json
View file

@ -2648,7 +2648,9 @@
"kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug",
"legacy": "powerpc-ieee1275",
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-299.1.el8.ppc64le",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2683,7 +2685,7 @@
"type": "41"
},
{
"size": 19912604,
"size": 19912704,
"start": 1058816,
"type": "8e"
},
@ -2727,7 +2729,7 @@
"options": {
"filename": "disk.img",
"start": 1058816,
"size": 19912604,
"size": 19912704,
"lock": true
}
}
@ -2751,7 +2753,7 @@
"options": {
"filename": "disk.img",
"start": 1058816,
"size": 19912604,
"size": 19912704,
"lock": true
}
}
@ -2775,7 +2777,7 @@
"options": {
"filename": "disk.img",
"start": 1058816,
"size": 19912604,
"size": 19912704,
"lock": true
}
}
@ -2799,7 +2801,7 @@
"options": {
"filename": "disk.img",
"start": 1058816,
"size": 19912604,
"size": 19912704,
"lock": true
}
}
@ -2862,7 +2864,7 @@
"options": {
"filename": "disk.img",
"start": 1058816,
"size": 19912604
"size": 19912704
}
},
"usr": {
@ -2918,7 +2920,7 @@
"options": {
"filename": "disk.img",
"start": 1058816,
"size": 19912604,
"size": 19912704,
"lock": true
}
}

8
test/data/manifests/rhel_85-s390x-qcow2-boot.json
View file

@ -2526,7 +2526,7 @@
"partitions": [
{
"bootable": true,
"size": 20969372,
"size": 20969472,
"start": 2048
}
]
@ -2552,7 +2552,7 @@
"options": {
"filename": "disk.img",
"start": 2048,
"size": 20969372,
"size": 20969472,
"lock": true
}
}
@ -2589,7 +2589,7 @@
"options": {
"filename": "disk.img",
"start": 2048,
"size": 20969372
"size": 20969472
}
}
},
@ -2620,7 +2620,7 @@
"options": {
"filename": "disk.img",
"start": 2048,
"size": 20969372
"size": 20969472
}
}
},

16
test/data/manifests/rhel_85-s390x-qcow2_customize-boot.json
View file

@ -2777,7 +2777,7 @@
"partitions": [
{
"bootable": true,
"size": 19920796,
"size": 19920896,
"start": 1050624,
"type": "8e"
},
@ -2821,7 +2821,7 @@
"options": {
"filename": "disk.img",
"start": 1050624,
"size": 19920796,
"size": 19920896,
"lock": true
}
}
@ -2845,7 +2845,7 @@
"options": {
"filename": "disk.img",
"start": 1050624,
"size": 19920796,
"size": 19920896,
"lock": true
}
}
@ -2869,7 +2869,7 @@
"options": {
"filename": "disk.img",
"start": 1050624,
"size": 19920796,
"size": 19920896,
"lock": true
}
}
@ -2893,7 +2893,7 @@
"options": {
"filename": "disk.img",
"start": 1050624,
"size": 19920796,
"size": 19920896,
"lock": true
}
}
@ -2962,7 +2962,7 @@
"options": {
"filename": "disk.img",
"start": 1050624,
"size": 19920796
"size": 19920896
}
},
"usr": {
@ -3018,7 +3018,7 @@
"options": {
"filename": "disk.img",
"start": 1050624,
"size": 19920796,
"size": 19920896,
"lock": true
}
}
@ -3057,7 +3057,7 @@
"options": {
"filename": "disk.img",
"start": 1050624,
"size": 19920796
"size": 19920896
}
},
"usr": {

76
test/data/manifests/rhel_85-x86_64-ami-boot.json
View file

@ -2054,17 +2054,6 @@
"default_target": "multi-user.target"
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.sysconfig",
"options": {
@ -2091,6 +2080,27 @@
}
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.cloud-init",
"options": {
@ -2127,6 +2137,18 @@
}
}
},
{
"type": "org.osbuild.dracut.conf",
"options": {
"filename": "ec2.conf",
"config": {
"add_drivers": [
"nvme",
"xen-blkfront"
]
}
}
},
{
"type": "org.osbuild.systemd.unit",
"options": {
@ -2145,16 +2167,6 @@
"profile": "sssd"
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.sshd.config",
"options": {
@ -2163,18 +2175,6 @@
}
}
},
{
"type": "org.osbuild.dracut.conf",
"options": {
"filename": "ec2.conf",
"config": {
"add_drivers": [
"nvme",
"xen-blkfront"
]
}
}
},
{
"type": "org.osbuild.fstab",
"options": {
@ -2195,7 +2195,9 @@
"kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
"legacy": "i386-pc",
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.x86_64",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2231,7 +2233,7 @@
"uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
},
{
"size": 20967324,
"size": 20967391,
"start": 4096,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -2260,7 +2262,7 @@
"options": {
"filename": "image.raw",
"start": 4096,
"size": 20967324,
"size": 20967391,
"lock": true
}
}
@ -2291,7 +2293,7 @@
"options": {
"filename": "image.raw",
"start": 4096,
"size": 20967324
"size": 20967391
}
}
},

82
test/data/manifests/rhel_85-x86_64-ec2-boot.json
View file

@ -2068,17 +2068,6 @@
"default_target": "multi-user.target"
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.sysconfig",
"options": {
@ -2105,6 +2094,30 @@
}
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.cloud-init",
"options": {
@ -2141,6 +2154,18 @@
}
}
},
{
"type": "org.osbuild.dracut.conf",
"options": {
"filename": "ec2.conf",
"config": {
"add_drivers": [
"nvme",
"xen-blkfront"
]
}
}
},
{
"type": "org.osbuild.systemd.unit",
"options": {
@ -2159,19 +2184,6 @@
"profile": "sssd"
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.sshd.config",
"options": {
@ -2180,18 +2192,6 @@
}
}
},
{
"type": "org.osbuild.dracut.conf",
"options": {
"filename": "ec2.conf",
"config": {
"add_drivers": [
"nvme",
"xen-blkfront"
]
}
}
},
{
"type": "org.osbuild.fstab",
"options": {
@ -2212,7 +2212,9 @@
"kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
"legacy": "i386-pc",
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.x86_64",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2248,7 +2250,7 @@
"uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
},
{
"size": 20967324,
"size": 20967391,
"start": 4096,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -2277,7 +2279,7 @@
"options": {
"filename": "image.raw",
"start": 4096,
"size": 20967324,
"size": 20967391,
"lock": true
}
}
@ -2308,7 +2310,7 @@
"options": {
"filename": "image.raw",
"start": 4096,
"size": 20967324
"size": 20967391
}
}
},

82
test/data/manifests/rhel_85-x86_64-ec2_ha-boot.json
View file

@ -2600,17 +2600,6 @@
"default_target": "multi-user.target"
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.sysconfig",
"options": {
@ -2637,6 +2626,30 @@
}
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.systemd-logind",
"options": {
"filename": "00-getty-fixes.conf",
"config": {
"Login": {
"NAutoVTs": 0
}
}
}
},
{
"type": "org.osbuild.cloud-init",
"options": {
@ -2673,6 +2686,18 @@
}
}
},
{
"type": "org.osbuild.dracut.conf",
"options": {
"filename": "ec2.conf",
"config": {
"add_drivers": [
"nvme",
"xen-blkfront"
]
}
}
},
{
"type": "org.osbuild.systemd.unit",
"options": {
@ -2691,19 +2716,6 @@
"profile": "sssd"
}
},
{
"type": "org.osbuild.rhsm",
"options": {
"subscription-manager": {
"rhsm": {
"manage_repos": false
},
"rhsmcertd": {
"auto_registration": true
}
}
}
},
{
"type": "org.osbuild.sshd.config",
"options": {
@ -2712,18 +2724,6 @@
}
}
},
{
"type": "org.osbuild.dracut.conf",
"options": {
"filename": "ec2.conf",
"config": {
"add_drivers": [
"nvme",
"xen-blkfront"
]
}
}
},
{
"type": "org.osbuild.fstab",
"options": {
@ -2744,7 +2744,9 @@
"kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto",
"legacy": "i386-pc",
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.x86_64",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2780,7 +2782,7 @@
"uuid": "FAC7F1FB-3E8D-4137-A512-961DE09A5549"
},
{
"size": 20967324,
"size": 20967391,
"start": 4096,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -2809,7 +2811,7 @@
"options": {
"filename": "image.raw",
"start": 4096,
"size": 20967324,
"size": 20967391,
"lock": true
}
}
@ -2840,7 +2842,7 @@
"options": {
"filename": "image.raw",
"start": 4096,
"size": 20967324
"size": 20967391
}
}
},

3
test/data/manifests/rhel_85-x86_64-edge_commit-boot.json
View file

@ -2024,7 +2024,8 @@
"enabled_services": [
"NetworkManager.service",
"firewalld.service",
"sshd.service"
"sshd.service",
"fdo-client-linuxapp.service"
]
}
},

3
test/data/manifests/rhel_85-x86_64-edge_commit_rt-boot.json
View file

@ -2096,7 +2096,8 @@
"enabled_services": [
"NetworkManager.service",
"firewalld.service",
"sshd.service"
"sshd.service",
"fdo-client-linuxapp.service"
]
}
},

3
test/data/manifests/rhel_85-x86_64-edge_container-boot.json
View file

@ -2014,7 +2014,8 @@
"enabled_services": [
"NetworkManager.service",
"firewalld.service",
"sshd.service"
"sshd.service",
"fdo-client-linuxapp.service"
]
}
},

27
test/data/manifests/rhel_85-x86_64-edge_installer-boot.json
View file

@ -3515,8 +3515,6 @@
"systemd-initrd",
"modsign",
"nss-softokn",
"rdma",
"rngd",
"i18n",
"convertfs",
"network-manager",
@ -3536,14 +3534,8 @@
"livenet",
"lvm",
"mdraid",
"multipath",
"qemu",
"qemu-net",
"fcoe",
"fcoe-uefi",
"iscsi",
"lunmask",
"nfs",
"resume",
"rootfs-block",
"terminfo",
@ -3557,12 +3549,26 @@
"shutdown",
"uefi-lib",
"biosdevname",
"anaconda"
"anaconda",
"rdma",
"rngd",
"multipath",
"fcoe",
"fcoe-uefi",
"iscsi",
"lunmask",
"nfs"
],
"install": [
"/.buildstamp"
]
}
},
{
"type": "org.osbuild.selinux.config",
"options": {
"state": "permissive"
}
}
]
},
@ -3674,7 +3680,8 @@
"filename": "installer.iso",
"volid": "RHEL-8-5-0-BaseOS-x86_64",
"sysid": "LINUX",
"efi": "images/efiboot.img"
"efi": "images/efiboot.img",
"isolevel": 3
}
},
{

27
test/data/manifests/rhel_85-x86_64-edge_installer_with_users-boot.json
View file

@ -3515,8 +3515,6 @@
"systemd-initrd",
"modsign",
"nss-softokn",
"rdma",
"rngd",
"i18n",
"convertfs",
"network-manager",
@ -3536,14 +3534,8 @@
"livenet",
"lvm",
"mdraid",
"multipath",
"qemu",
"qemu-net",
"fcoe",
"fcoe-uefi",
"iscsi",
"lunmask",
"nfs",
"resume",
"rootfs-block",
"terminfo",
@ -3557,12 +3549,26 @@
"shutdown",
"uefi-lib",
"biosdevname",
"anaconda"
"anaconda",
"rdma",
"rngd",
"multipath",
"fcoe",
"fcoe-uefi",
"iscsi",
"lunmask",
"nfs"
],
"install": [
"/.buildstamp"
]
}
},
{
"type": "org.osbuild.selinux.config",
"options": {
"state": "permissive"
}
}
]
},
@ -3674,7 +3680,8 @@
"filename": "installer.iso",
"volid": "RHEL-8-5-0-BaseOS-x86_64",
"sysid": "LINUX",
"efi": "images/efiboot.img"
"efi": "images/efiboot.img",
"isolevel": 3
}
},
{

55
test/data/manifests/rhel_85-x86_64-gce-boot.json
View file

@ -1803,6 +1803,9 @@
{
"id": "sha256:6103a6b9eb69f8b79999371c124bdc21f1bedd64c8d67a73a06daf2f6307956f"
},
{
"id": "sha256:6ac86e716545bfde2c56ca9632aa35d211386a94251aecd44749f3998dbe4732"
},
{
"id": "sha256:ca00963bae82fdd87827009ab2e1be386729f374f767ba40f9da1e4b4b2c71cb"
},
@ -1818,6 +1821,9 @@
{
"id": "sha256:4ad66a3a1dd79384852669609567108dcc429607d40ca8adc5f1dbe6a9d6bdde"
},
{
"id": "sha256:de870435340bf30620406df41b79e43adaf7d0a277db1635a0fae710df993fc0"
},
{
"id": "sha256:d94ea399f82d4f9537af1098a588c5cc9a80454ba7c1de9b26dd11cb5c730d8a"
},
@ -2022,6 +2028,9 @@
{
"id": "sha256:09c61ef07a48cc48b2c8ab3247a93a5bd1d834b37e32345341eb4ba7b86e0f0a"
},
{
"id": "sha256:606a1f63731d99f3814dbcb232f63b4776d389c3301f702e2be15acac163be58"
},
{
"id": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
},
@ -2378,7 +2387,9 @@
"vendor": "redhat"
},
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.x86_64",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2420,7 +2431,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 41734044,
"size": 41734111,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -2466,7 +2477,7 @@
"options": {
"filename": "disk.raw",
"start": 208896,
"size": 41734044,
"size": 41734111,
"lock": true
}
}
@ -2505,7 +2516,7 @@
"options": {
"filename": "disk.raw",
"start": 208896,
"size": 41734044
"size": 41734111
}
}
},
@ -3109,6 +3120,9 @@
"sha256:5ffaf4869bdd844266a156b9f1fda9d64e4f79db592384a145bf064aaca47b41": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/lshw-B.02.19.2-6.el8.x86_64.rpm"
},
"sha256:606a1f63731d99f3814dbcb232f63b4776d389c3301f702e2be15acac163be58": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/insights-client-3.1.5-1.el8.noarch.rpm"
},
"sha256:6103a6b9eb69f8b79999371c124bdc21f1bedd64c8d67a73a06daf2f6307956f": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-linux-procfs-0.6.3-1.el8.noarch.rpm"
},
@ -3151,6 +3165,9 @@
"sha256:6aab23e22ca99314106df2068464bec8a2d78cf59cb1335ae9b63b3a06e808f8": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/openssl-1.1.1k-4.el8.x86_64.rpm"
},
"sha256:6ac86e716545bfde2c56ca9632aa35d211386a94251aecd44749f3998dbe4732": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-magic-5.33-20.el8.noarch.rpm"
},
"sha256:6b52102af0aab3b41a5d410b7717713aef3adc48c41015a745c9c5a2ba7b814f": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libdb-utils-5.3.28-42.el8_4.x86_64.rpm"
},
@ -3793,6 +3810,9 @@
"sha256:dc874028a25d78374ffa470d7cba5f0eb89d543a486a645f51cde3aafb6efc93": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/rhc-0.2.0-3.el8.x86_64.rpm"
},
"sha256:de870435340bf30620406df41b79e43adaf7d0a277db1635a0fae710df993fc0": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-pyyaml-3.12-12.el8.x86_64.rpm"
},
"sha256:deb0d0ad2726988b4dfb9c12c7217f868269b45fee929431e2b32e1d4c772a77": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-rpm-4.14.3-19.el8.x86_64.rpm"
},
@ -9132,6 +9152,15 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-linux-procfs-0.6.3-1.el8.noarch.rpm",
"checksum": "sha256:6103a6b9eb69f8b79999371c124bdc21f1bedd64c8d67a73a06daf2f6307956f"
},
{
"name": "python3-magic",
"epoch": 0,
"version": "5.33",
"release": "20.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-magic-5.33-20.el8.noarch.rpm",
"checksum": "sha256:6ac86e716545bfde2c56ca9632aa35d211386a94251aecd44749f3998dbe4732"
},
{
"name": "python3-nftables",
"epoch": 1,
@ -9177,6 +9206,15 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-pyudev-0.21.0-7.el8.noarch.rpm",
"checksum": "sha256:4ad66a3a1dd79384852669609567108dcc429607d40ca8adc5f1dbe6a9d6bdde"
},
{
"name": "python3-pyyaml",
"epoch": 0,
"version": "3.12",
"release": "12.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-pyyaml-3.12-12.el8.x86_64.rpm",
"checksum": "sha256:de870435340bf30620406df41b79e43adaf7d0a277db1635a0fae710df993fc0"
},
{
"name": "python3-requests",
"epoch": 0,
@ -9789,6 +9827,15 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/gpm-libs-1.20.7-17.el8.x86_64.rpm",
"checksum": "sha256:09c61ef07a48cc48b2c8ab3247a93a5bd1d834b37e32345341eb4ba7b86e0f0a"
},
{
"name": "insights-client",
"epoch": 0,
"version": "3.1.5",
"release": "1.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/insights-client-3.1.5-1.el8.noarch.rpm",
"checksum": "sha256:606a1f63731d99f3814dbcb232f63b4776d389c3301f702e2be15acac163be58"
},
{
"name": "langpacks-en",
"epoch": 0,

55
test/data/manifests/rhel_85-x86_64-gce_rhui-boot.json
View file

@ -1803,6 +1803,9 @@
{
"id": "sha256:6103a6b9eb69f8b79999371c124bdc21f1bedd64c8d67a73a06daf2f6307956f"
},
{
"id": "sha256:6ac86e716545bfde2c56ca9632aa35d211386a94251aecd44749f3998dbe4732"
},
{
"id": "sha256:ca00963bae82fdd87827009ab2e1be386729f374f767ba40f9da1e4b4b2c71cb"
},
@ -1818,6 +1821,9 @@
{
"id": "sha256:4ad66a3a1dd79384852669609567108dcc429607d40ca8adc5f1dbe6a9d6bdde"
},
{
"id": "sha256:de870435340bf30620406df41b79e43adaf7d0a277db1635a0fae710df993fc0"
},
{
"id": "sha256:d94ea399f82d4f9537af1098a588c5cc9a80454ba7c1de9b26dd11cb5c730d8a"
},
@ -2022,6 +2028,9 @@
{
"id": "sha256:09c61ef07a48cc48b2c8ab3247a93a5bd1d834b37e32345341eb4ba7b86e0f0a"
},
{
"id": "sha256:606a1f63731d99f3814dbcb232f63b4776d389c3301f702e2be15acac163be58"
},
{
"id": "sha256:38affe91361bf56b84490d97c7e3f815965cf8d2bbb222c6c045af4bf2dff736"
},
@ -2389,7 +2398,9 @@
"vendor": "redhat"
},
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.x86_64",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2431,7 +2442,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 41734044,
"size": 41734111,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -2477,7 +2488,7 @@
"options": {
"filename": "disk.raw",
"start": 208896,
"size": 41734044,
"size": 41734111,
"lock": true
}
}
@ -2516,7 +2527,7 @@
"options": {
"filename": "disk.raw",
"start": 208896,
"size": 41734044
"size": 41734111
}
}
},
@ -3120,6 +3131,9 @@
"sha256:5ffaf4869bdd844266a156b9f1fda9d64e4f79db592384a145bf064aaca47b41": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/lshw-B.02.19.2-6.el8.x86_64.rpm"
},
"sha256:606a1f63731d99f3814dbcb232f63b4776d389c3301f702e2be15acac163be58": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/insights-client-3.1.5-1.el8.noarch.rpm"
},
"sha256:6103a6b9eb69f8b79999371c124bdc21f1bedd64c8d67a73a06daf2f6307956f": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-linux-procfs-0.6.3-1.el8.noarch.rpm"
},
@ -3162,6 +3176,9 @@
"sha256:6aab23e22ca99314106df2068464bec8a2d78cf59cb1335ae9b63b3a06e808f8": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/openssl-1.1.1k-4.el8.x86_64.rpm"
},
"sha256:6ac86e716545bfde2c56ca9632aa35d211386a94251aecd44749f3998dbe4732": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-magic-5.33-20.el8.noarch.rpm"
},
"sha256:6b52102af0aab3b41a5d410b7717713aef3adc48c41015a745c9c5a2ba7b814f": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/libdb-utils-5.3.28-42.el8_4.x86_64.rpm"
},
@ -3807,6 +3824,9 @@
"sha256:dc874028a25d78374ffa470d7cba5f0eb89d543a486a645f51cde3aafb6efc93": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/rhc-0.2.0-3.el8.x86_64.rpm"
},
"sha256:de870435340bf30620406df41b79e43adaf7d0a277db1635a0fae710df993fc0": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-pyyaml-3.12-12.el8.x86_64.rpm"
},
"sha256:deb0d0ad2726988b4dfb9c12c7217f868269b45fee929431e2b32e1d4c772a77": {
"url": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-rpm-4.14.3-19.el8.x86_64.rpm"
},
@ -9146,6 +9166,15 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-linux-procfs-0.6.3-1.el8.noarch.rpm",
"checksum": "sha256:6103a6b9eb69f8b79999371c124bdc21f1bedd64c8d67a73a06daf2f6307956f"
},
{
"name": "python3-magic",
"epoch": 0,
"version": "5.33",
"release": "20.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-magic-5.33-20.el8.noarch.rpm",
"checksum": "sha256:6ac86e716545bfde2c56ca9632aa35d211386a94251aecd44749f3998dbe4732"
},
{
"name": "python3-nftables",
"epoch": 1,
@ -9191,6 +9220,15 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-pyudev-0.21.0-7.el8.noarch.rpm",
"checksum": "sha256:4ad66a3a1dd79384852669609567108dcc429607d40ca8adc5f1dbe6a9d6bdde"
},
{
"name": "python3-pyyaml",
"epoch": 0,
"version": "3.12",
"release": "12.el8",
"arch": "x86_64",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-baseos-r8.5-20220504/Packages/python3-pyyaml-3.12-12.el8.x86_64.rpm",
"checksum": "sha256:de870435340bf30620406df41b79e43adaf7d0a277db1635a0fae710df993fc0"
},
{
"name": "python3-requests",
"epoch": 0,
@ -9803,6 +9841,15 @@
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/gpm-libs-1.20.7-17.el8.x86_64.rpm",
"checksum": "sha256:09c61ef07a48cc48b2c8ab3247a93a5bd1d834b37e32345341eb4ba7b86e0f0a"
},
{
"name": "insights-client",
"epoch": 0,
"version": "3.1.5",
"release": "1.el8",
"arch": "noarch",
"remote_location": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el8/el8-x86_64-appstream-r8.5-20220504/Packages/insights-client-3.1.5-1.el8.noarch.rpm",
"checksum": "sha256:606a1f63731d99f3814dbcb232f63b4776d389c3301f702e2be15acac163be58"
},
{
"name": "langpacks-en",
"epoch": 0,

29
test/data/manifests/rhel_85-x86_64-image_installer-boot.json
View file

@ -5007,7 +5007,7 @@
"product": "Red Hat Enterprise Linux",
"version": "8.5",
"final": true,
"variant": "edge",
"variant": "BaseOS",
"bugurl": ""
}
},
@ -5069,8 +5069,6 @@
"systemd-initrd",
"modsign",
"nss-softokn",
"rdma",
"rngd",
"i18n",
"convertfs",
"network-manager",
@ -5090,14 +5088,8 @@
"livenet",
"lvm",
"mdraid",
"multipath",
"qemu",
"qemu-net",
"fcoe",
"fcoe-uefi",
"iscsi",
"lunmask",
"nfs",
"resume",
"rootfs-block",
"terminfo",
@ -5111,12 +5103,26 @@
"shutdown",
"uefi-lib",
"biosdevname",
"anaconda"
"anaconda",
"rdma",
"rngd",
"multipath",
"fcoe",
"fcoe-uefi",
"iscsi",
"lunmask",
"nfs"
],
"install": [
"/.buildstamp"
]
}
},
{
"type": "org.osbuild.selinux.config",
"options": {
"state": "permissive"
}
}
]
},
@ -5222,7 +5228,8 @@
"catalog": "isolinux/boot.cat"
},
"efi": "images/efiboot.img",
"isohybridmbr": "/usr/share/syslinux/isohdpfx.bin"
"isohybridmbr": "/usr/share/syslinux/isohdpfx.bin",
"isolevel": 3
}
},
{

29
test/data/manifests/rhel_85-x86_64-image_installer_with_users-boot.json
View file

@ -5036,7 +5036,7 @@
"product": "Red Hat Enterprise Linux",
"version": "8.5",
"final": true,
"variant": "edge",
"variant": "BaseOS",
"bugurl": ""
}
},
@ -5098,8 +5098,6 @@
"systemd-initrd",
"modsign",
"nss-softokn",
"rdma",
"rngd",
"i18n",
"convertfs",
"network-manager",
@ -5119,14 +5117,8 @@
"livenet",
"lvm",
"mdraid",
"multipath",
"qemu",
"qemu-net",
"fcoe",
"fcoe-uefi",
"iscsi",
"lunmask",
"nfs",
"resume",
"rootfs-block",
"terminfo",
@ -5140,12 +5132,26 @@
"shutdown",
"uefi-lib",
"biosdevname",
"anaconda"
"anaconda",
"rdma",
"rngd",
"multipath",
"fcoe",
"fcoe-uefi",
"iscsi",
"lunmask",
"nfs"
],
"install": [
"/.buildstamp"
]
}
},
{
"type": "org.osbuild.selinux.config",
"options": {
"state": "permissive"
}
}
]
},
@ -5273,7 +5279,8 @@
"catalog": "isolinux/boot.cat"
},
"efi": "images/efiboot.img",
"isohybridmbr": "/usr/share/syslinux/isohdpfx.bin"
"isohybridmbr": "/usr/share/syslinux/isohdpfx.bin",
"isolevel": 3
}
},
{

10
test/data/manifests/rhel_85-x86_64-oci-boot.json
View file

@ -2253,7 +2253,9 @@
"vendor": "redhat"
},
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.x86_64",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2295,7 +2297,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 20762524,
"size": 20762591,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -2341,7 +2343,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 20762524,
"size": 20762591,
"lock": true
}
}
@ -2380,7 +2382,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 20762524
"size": 20762591
}
}
},

10
test/data/manifests/rhel_85-x86_64-openstack-boot.json
View file

@ -2294,7 +2294,9 @@
"vendor": "redhat"
},
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.x86_64",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2336,7 +2338,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 8179612,
"size": 8179679,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -2382,7 +2384,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612,
"size": 8179679,
"lock": true
}
}
@ -2421,7 +2423,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612
"size": 8179679
}
}
},

10
test/data/manifests/rhel_85-x86_64-qcow2-boot.json
View file

@ -2277,7 +2277,9 @@
"vendor": "redhat"
},
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.x86_64",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2319,7 +2321,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 20762524,
"size": 20762591,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -2365,7 +2367,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 20762524,
"size": 20762591,
"lock": true
}
}
@ -2404,7 +2406,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 20762524
"size": 20762591
}
}
},

18
test/data/manifests/rhel_85-x86_64-qcow2_customize-boot.json
View file

@ -2535,7 +2535,9 @@
"vendor": "redhat"
},
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.x86_64",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2577,7 +2579,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 19713948,
"size": 19714015,
"start": 1257472,
"type": "E6D6D379-F507-44C2-A23C-238F2A3DF928",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -2624,7 +2626,7 @@
"options": {
"filename": "disk.img",
"start": 1257472,
"size": 19713948,
"size": 19714015,
"lock": true
}
}
@ -2666,7 +2668,7 @@
"options": {
"filename": "disk.img",
"start": 1257472,
"size": 19713948,
"size": 19714015,
"lock": true
}
}
@ -2690,7 +2692,7 @@
"options": {
"filename": "disk.img",
"start": 1257472,
"size": 19713948,
"size": 19714015,
"lock": true
}
}
@ -2714,7 +2716,7 @@
"options": {
"filename": "disk.img",
"start": 1257472,
"size": 19713948,
"size": 19714015,
"lock": true
}
}
@ -2785,7 +2787,7 @@
"options": {
"filename": "disk.img",
"start": 1257472,
"size": 19713948
"size": 19714015
}
},
"usr": {
@ -2847,7 +2849,7 @@
"options": {
"filename": "disk.img",
"start": 1257472,
"size": 19713948,
"size": 19714015,
"lock": true
}
}

10
test/data/manifests/rhel_85-x86_64-vhd-boot.json
View file

@ -2289,7 +2289,9 @@
"vendor": "redhat"
},
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.x86_64",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2331,7 +2333,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 8179612,
"size": 8179679,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -2377,7 +2379,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612,
"size": 8179679,
"lock": true
}
}
@ -2416,7 +2418,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612
"size": 8179679
}
}
},

10
test/data/manifests/rhel_85-x86_64-vmdk-boot.json
View file

@ -2288,7 +2288,9 @@
"vendor": "redhat"
},
"saved_entry": "ffffffffffffffffffffffffffffffff-4.18.0-348.el8.x86_64",
"config": {}
"config": {
"default": "saved"
}
}
},
{
@ -2330,7 +2332,7 @@
"uuid": "68B2905B-DF3E-4FB3-80FA-49D1E773AA33"
},
{
"size": 8179612,
"size": 8179679,
"start": 208896,
"type": "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
"uuid": "6264D520-3FB9-423F-8AB8-7A0A8E3D3562"
@ -2376,7 +2378,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612,
"size": 8179679,
"lock": true
}
}
@ -2415,7 +2417,7 @@
"options": {
"filename": "disk.img",
"start": 208896,
"size": 8179612
"size": 8179679
}
}
},