From eb36b86161c23b435e2c6694b9a8f810a35a9a0e Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Tue, 18 Jan 2022 10:42:04 +0100 Subject: [PATCH] RHEL-90: Remove deprecated crashkernel=auto option Setting of the `crashkernel` option to the appropriate value is now done by the `kexec-tools` package when installed and when any new kernel is installed. Regenerate relevant image test cases. Fix #1819 Fix rhbz#2006692 Signed-off-by: Tomas Hozza --- internal/distro/rhel90/distro.go | 14 +++++++------- test/data/manifests/rhel_90-aarch64-ami-boot.json | 11 ++++++----- test/data/manifests/rhel_90-aarch64-ec2-boot.json | 11 ++++++----- .../data/manifests/rhel_90-aarch64-qcow2-boot.json | 8 ++++---- .../rhel_90-aarch64-qcow2_customize-boot.json | 10 +++++----- .../data/manifests/rhel_90-ppc64le-qcow2-boot.json | 10 +++++----- .../rhel_90-ppc64le-qcow2_customize-boot.json | 12 ++++++------ test/data/manifests/rhel_90-s390x-qcow2-boot.json | 8 ++++---- .../rhel_90-s390x-qcow2_customize-boot.json | 12 ++++++------ test/data/manifests/rhel_90-x86_64-ami-boot.json | 11 ++++++----- test/data/manifests/rhel_90-x86_64-ec2-boot.json | 11 ++++++----- .../data/manifests/rhel_90-x86_64-ec2_ha-boot.json | 11 ++++++----- .../manifests/rhel_90-x86_64-ec2_sap-boot.json | 11 ++++++----- test/data/manifests/rhel_90-x86_64-qcow2-boot.json | 8 ++++---- .../rhel_90-x86_64-qcow2_customize-boot.json | 10 +++++----- 15 files changed, 82 insertions(+), 76 deletions(-) diff --git a/internal/distro/rhel90/distro.go b/internal/distro/rhel90/distro.go index c4d4519fd..86b416acb 100644 --- a/internal/distro/rhel90/distro.go +++ b/internal/distro/rhel90/distro.go @@ -718,7 +718,7 @@ func newDistro(distroName string) distro.Distro { name: "qcow2", filename: "disk.qcow2", mimeType: "application/x-qemu-disk", - kernelOptions: "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", + kernelOptions: "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0", packageSets: map[string]packageSetFunc{ buildPkgsKey: distroBuildPackageSet, osPkgsKey: qcow2CommonPackageSet, @@ -1009,7 +1009,7 @@ func newDistro(distroName string) distro.Distro { osPkgsKey: ec2CommonPackageSet, }, defaultImageConfig: defaultAMIImageConfigX86_64, - kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295", bootable: true, bootType: distro.LegacyBootType, defaultSize: 10 * GigaByte, @@ -1029,7 +1029,7 @@ func newDistro(distroName string) distro.Distro { osPkgsKey: ec2CommonPackageSet, }, defaultImageConfig: defaultAMIImageConfig, - kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto", + kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0", bootable: true, defaultSize: 10 * GigaByte, pipelines: ec2Pipelines, @@ -1048,7 +1048,7 @@ func newDistro(distroName string) distro.Distro { osPkgsKey: rhelEc2PackageSet, }, defaultImageConfig: defaultEc2ImageConfigX86_64, - kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295", bootable: true, bootType: distro.LegacyBootType, defaultSize: 10 * GigaByte, @@ -1068,7 +1068,7 @@ func newDistro(distroName string) distro.Distro { osPkgsKey: rhelEc2PackageSet, }, defaultImageConfig: defaultEc2ImageConfig, - kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto", + kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0", bootable: true, defaultSize: 10 * GigaByte, pipelines: rhelEc2Pipelines, @@ -1087,7 +1087,7 @@ func newDistro(distroName string) distro.Distro { osPkgsKey: rhelEc2HaPackageSet, }, defaultImageConfig: defaultEc2ImageConfigX86_64, - kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295", bootable: true, bootType: distro.LegacyBootType, defaultSize: 10 * GigaByte, @@ -1218,7 +1218,7 @@ func newDistro(distroName string) distro.Distro { osPkgsKey: rhelEc2SapPackageSet, }, defaultImageConfig: defaultEc2SapImageConfigX86_64, - kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1", + kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 processor.max_cstate=1 intel_idle.max_cstate=1", bootable: true, bootType: distro.LegacyBootType, defaultSize: 10 * GigaByte, diff --git a/test/data/manifests/rhel_90-aarch64-ami-boot.json b/test/data/manifests/rhel_90-aarch64-ami-boot.json index a83c38825..22182ae6e 100644 --- a/test/data/manifests/rhel_90-aarch64-ami-boot.json +++ b/test/data/manifests/rhel_90-aarch64-ami-boot.json @@ -278,7 +278,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto" + "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0" } }, { @@ -1016,7 +1016,7 @@ "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto", + "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0", "uefi": { "vendor": "redhat", "unified": true @@ -9094,7 +9094,7 @@ "profile-id": "sssd" }, "boot-environment": { - "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.aarch64" }, "bootloader": "unknown", @@ -9105,7 +9105,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0", "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -9115,7 +9115,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.14.0-4.el9.aarch64.img $tuned_initrd", "linux": "/vmlinuz-5.14.0-4.el9.aarch64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto $tuned_params", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.aarch64) 9.0 (Plow)", "version": "5.14.0-4.el9.aarch64" } @@ -9957,6 +9957,7 @@ "/etc/pam.d/smartcard-auth": "....L....", "/etc/pam.d/system-auth": "....L....", "/etc/rhsm/rhsm.conf": "..5....T.", + "/etc/ssh/sshd_config": "S.5....T.", "/etc/udev/hwdb.bin": ".M.......", "/proc": ".M.......", "/sys": ".M.......", diff --git a/test/data/manifests/rhel_90-aarch64-ec2-boot.json b/test/data/manifests/rhel_90-aarch64-ec2-boot.json index fac186795..639d642e7 100644 --- a/test/data/manifests/rhel_90-aarch64-ec2-boot.json +++ b/test/data/manifests/rhel_90-aarch64-ec2-boot.json @@ -287,7 +287,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto" + "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0" } }, { @@ -1030,7 +1030,7 @@ "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto", + "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0", "uefi": { "vendor": "redhat", "unified": true @@ -9143,7 +9143,7 @@ "profile-id": "sssd" }, "boot-environment": { - "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.aarch64" }, "bootloader": "unknown", @@ -9154,7 +9154,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0", "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -9164,7 +9164,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.14.0-4.el9.aarch64.img $tuned_initrd", "linux": "/vmlinuz-5.14.0-4.el9.aarch64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto $tuned_params", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.aarch64) 9.0 (Plow)", "version": "5.14.0-4.el9.aarch64" } @@ -10007,6 +10007,7 @@ "/etc/pam.d/smartcard-auth": "....L....", "/etc/pam.d/system-auth": "....L....", "/etc/rhsm/rhsm.conf": "..5....T.", + "/etc/ssh/sshd_config": "S.5....T.", "/etc/udev/hwdb.bin": ".M.......", "/etc/yum.repos.d/redhat-rhui-beta.repo": "..5....T.", "/etc/yum.repos.d/redhat-rhui-client-config.repo": "..5....T.", diff --git a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json index d3cb78480..184ade182 100644 --- a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json @@ -291,7 +291,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" + "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0" } }, { @@ -932,7 +932,7 @@ "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", + "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0", "uefi": { "vendor": "redhat", "unified": true @@ -9189,7 +9189,7 @@ "image-info": { "/etc/resolv.conf": [], "boot-environment": { - "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.aarch64" }, "bootloader": "unknown", @@ -9200,7 +9200,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.14.0-4.el9.aarch64.img $tuned_initrd", "linux": "/vmlinuz-5.14.0-4.el9.aarch64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.aarch64) 9.0 (Plow)", "version": "5.14.0-4.el9.aarch64" } 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 ce58a997b..c3e5ac1c5 100644 --- a/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90-aarch64-qcow2_customize-boot.json @@ -349,7 +349,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" + "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0" } }, { @@ -1272,7 +1272,7 @@ "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug", + "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug", "uefi": { "vendor": "redhat", "unified": true @@ -11623,7 +11623,7 @@ "image-info": { "/etc/resolv.conf": [], "boot-environment": { - "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.aarch64" }, "bootloader": "unknown", @@ -11634,7 +11634,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0", "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -11644,7 +11644,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.14.0-4.el9.aarch64.img $tuned_initrd", "linux": "/vmlinuz-5.14.0-4.el9.aarch64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.aarch64) 9.0 (Plow)", "version": "5.14.0-4.el9.aarch64" } diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json index ef0d7912b..c8134503b 100644 --- a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json @@ -302,7 +302,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" + "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0" } }, { @@ -989,7 +989,7 @@ "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", + "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0", "legacy": "powerpc-ieee1275", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.ppc64le" } @@ -9985,7 +9985,7 @@ ] }, "boot-environment": { - "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.ppc64le" }, "bootloader": "unknown", @@ -9996,7 +9996,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.14.0-4.el9.ppc64le.img $tuned_initrd", "linux": "/vmlinuz-5.14.0-4.el9.ppc64le", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.ppc64le) 9.0 (Plow)", "version": "5.14.0-4.el9.ppc64le" } @@ -10776,7 +10776,7 @@ "partuuid": "14fc63d2-02", "size": 524288000, "start": 5242880, - "type": "0", + "type": "83", "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" }, { 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 50d81457e..f0fed00e4 100644 --- a/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90-ppc64le-qcow2_customize-boot.json @@ -360,7 +360,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" + "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0" } }, { @@ -1335,7 +1335,7 @@ "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug", + "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug", "legacy": "powerpc-ieee1275", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.ppc64le" } @@ -12479,7 +12479,7 @@ ] }, "boot-environment": { - "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.ppc64le" }, "bootloader": "unknown", @@ -12490,7 +12490,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0", "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -12500,7 +12500,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.14.0-4.el9.ppc64le.img $tuned_initrd", "linux": "/vmlinuz-5.14.0-4.el9.ppc64le", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.ppc64le) 9.0 (Plow)", "version": "5.14.0-4.el9.ppc64le" } @@ -13307,7 +13307,7 @@ "partuuid": "14fc63d2-02", "size": 524288000, "start": 5242880, - "type": "0", + "type": "83", "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" }, { diff --git a/test/data/manifests/rhel_90-s390x-qcow2-boot.json b/test/data/manifests/rhel_90-s390x-qcow2-boot.json index 0381adac8..ad98816e3 100644 --- a/test/data/manifests/rhel_90-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_90-s390x-qcow2-boot.json @@ -406,7 +406,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" + "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0" } }, { @@ -10927,10 +10927,10 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "id": "-20211207101433-5.14.0-4.el9.s390x", + "id": "-20220204144212-5.14.0-4.el9.s390x", "initrd": "/boot/initramfs-5.14.0-4.el9.s390x.img", "linux": "/boot/vmlinuz-5.14.0-4.el9.s390x", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0", "title": " (5.14.0-4.el9.s390x)", "version": "5.14.0-4.el9.s390x" } @@ -11684,7 +11684,7 @@ "partuuid": "14fc63d2-01", "size": 524288000, "start": 1048576, - "type": "0", + "type": "83", "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" }, { 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 dcadb0266..f000cecea 100644 --- a/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json +++ b/test/data/manifests/rhel_90-s390x-qcow2_customize-boot.json @@ -464,7 +464,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" + "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0" } }, { @@ -13261,10 +13261,10 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "id": "-20211207101636-0-rescue-ffffffffffffffffffffffffffffffff", + "id": "-20220204144421-0-rescue-ffffffffffffffffffffffffffffffff", "initrd": "/boot/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", "linux": "/boot/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0", "title": " (0-rescue-ffffffffffffffffffffffffffffffff)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -13272,10 +13272,10 @@ "grub_arg": "--unrestricted", "grub_class": "kernel", "grub_users": "$grub_users", - "id": "-20211207101636-5.14.0-4.el9.s390x", + "id": "-20220204144421-5.14.0-4.el9.s390x", "initrd": "/boot/initramfs-5.14.0-4.el9.s390x.img", "linux": "/boot/vmlinuz-5.14.0-4.el9.s390x", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0", "title": " (5.14.0-4.el9.s390x)", "version": "5.14.0-4.el9.s390x" } @@ -14056,7 +14056,7 @@ "partuuid": "14fc63d2-01", "size": 524288000, "start": 1048576, - "type": "0", + "type": "83", "uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8" }, { 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 bb00085cf..b14c99c39 100644 --- a/test/data/manifests/rhel_90-x86_64-ami-boot.json +++ b/test/data/manifests/rhel_90-x86_64-ami-boot.json @@ -292,7 +292,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto" + "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295" } }, { @@ -1011,7 +1011,7 @@ "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295", "legacy": "i386-pc", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" } @@ -8878,7 +8878,7 @@ "profile-id": "sssd" }, "boot-environment": { - "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" }, "bootloader": "grub", @@ -8889,7 +8889,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295", "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -8899,7 +8899,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", "linux": "/vmlinuz-5.14.0-4.el9.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto $tuned_params", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.x86_64) 9.0 (Plow)", "version": "5.14.0-4.el9.x86_64" } @@ -9721,6 +9721,7 @@ "/etc/pam.d/smartcard-auth": "....L....", "/etc/pam.d/system-auth": "....L....", "/etc/rhsm/rhsm.conf": "..5....T.", + "/etc/ssh/sshd_config": "S.5....T.", "/etc/udev/hwdb.bin": ".M.......", "/proc": ".M.......", "/sys": ".M.......", 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 240e0ca77..e288a3102 100644 --- a/test/data/manifests/rhel_90-x86_64-ec2-boot.json +++ b/test/data/manifests/rhel_90-x86_64-ec2-boot.json @@ -303,7 +303,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto" + "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295" } }, { @@ -1027,7 +1027,7 @@ "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295", "legacy": "i386-pc", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" } @@ -8929,7 +8929,7 @@ "profile-id": "sssd" }, "boot-environment": { - "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" }, "bootloader": "grub", @@ -8940,7 +8940,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295", "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -8950,7 +8950,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", "linux": "/vmlinuz-5.14.0-4.el9.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto $tuned_params", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.x86_64) 9.0 (Plow)", "version": "5.14.0-4.el9.x86_64" } @@ -9773,6 +9773,7 @@ "/etc/pam.d/smartcard-auth": "....L....", "/etc/pam.d/system-auth": "....L....", "/etc/rhsm/rhsm.conf": "..5....T.", + "/etc/ssh/sshd_config": "S.5....T.", "/etc/udev/hwdb.bin": ".M.......", "/etc/yum.repos.d/redhat-rhui-beta.repo": "..5....T.", "/etc/yum.repos.d/redhat-rhui-client-config.repo": "..5....T.", 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 7371f3820..7ac8e170e 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 @@ -313,7 +313,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto" + "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295" } }, { @@ -1221,7 +1221,7 @@ "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295", "legacy": "i386-pc", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" } @@ -11316,7 +11316,7 @@ "profile-id": "sssd" }, "boot-environment": { - "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" }, "bootloader": "grub", @@ -11327,7 +11327,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295", "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -11337,7 +11337,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", "linux": "/vmlinuz-5.14.0-4.el9.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto $tuned_params", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.x86_64) 9.0 (Plow)", "version": "5.14.0-4.el9.x86_64" } @@ -12353,6 +12353,7 @@ "/etc/pam.d/smartcard-auth": "....L....", "/etc/pam.d/system-auth": "....L....", "/etc/rhsm/rhsm.conf": "..5....T.", + "/etc/ssh/sshd_config": "S.5....T.", "/etc/udev/hwdb.bin": ".M.......", "/proc": ".M.......", "/sys": ".M.......", 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 f2b683ed8..ed2460dd6 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 @@ -331,7 +331,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1" + "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 processor.max_cstate=1 intel_idle.max_cstate=1" } }, { @@ -1392,7 +1392,7 @@ "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1", + "kernel_opts": "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 processor.max_cstate=1 intel_idle.max_cstate=1", "legacy": "i386-pc", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" } @@ -11895,7 +11895,7 @@ "profile-id": "sssd" }, "boot-environment": { - "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 processor.max_cstate=1 intel_idle.max_cstate=1", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" }, "bootloader": "grub", @@ -11906,7 +11906,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 processor.max_cstate=1 intel_idle.max_cstate=1", "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -11916,7 +11916,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", "linux": "/vmlinuz-5.14.0-4.el9.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 crashkernel=auto processor.max_cstate=1 intel_idle.max_cstate=1 $tuned_params", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 processor.max_cstate=1 intel_idle.max_cstate=1 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.x86_64) 9.0 (Plow)", "version": "5.14.0-4.el9.x86_64" } @@ -12967,6 +12967,7 @@ "/etc/pam.d/smartcard-auth": "....L....", "/etc/pam.d/system-auth": "....L....", "/etc/rhsm/rhsm.conf": "..5....T.", + "/etc/ssh/sshd_config": "S.5....T.", "/etc/udev/hwdb.bin": ".M.......", "/proc": ".M.......", "/sys": ".M.......", 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 94e584e4f..0be30df97 100644 --- a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json @@ -305,7 +305,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" + "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0" } }, { @@ -952,7 +952,7 @@ "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", + "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0", "legacy": "i386-pc", "uefi": { "vendor": "redhat" @@ -9442,7 +9442,7 @@ "image-info": { "/etc/resolv.conf": [], "boot-environment": { - "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" }, "bootloader": "grub", @@ -9453,7 +9453,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", "linux": "/vmlinuz-5.14.0-4.el9.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.x86_64) 9.0 (Plow)", "version": "5.14.0-4.el9.x86_64" } 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 6be6f2e8f..8ee5e6ca5 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 @@ -363,7 +363,7 @@ "type": "org.osbuild.kernel-cmdline", "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", - "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto" + "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0" } }, { @@ -1309,7 +1309,7 @@ "options": { "root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75", "boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8", - "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug", + "kernel_opts": "console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug", "legacy": "i386-pc", "uefi": { "vendor": "redhat" @@ -12082,7 +12082,7 @@ "image-info": { "/etc/resolv.conf": [], "boot-environment": { - "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto debug", + "kernelopts": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 debug", "saved_entry": "ffffffffffffffffffffffffffffffff-5.14.0-4.el9.x86_64" }, "bootloader": "grub", @@ -12093,7 +12093,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-0-rescue-ffffffffffffffffffffffffffffffff.img", "linux": "/vmlinuz-0-rescue-ffffffffffffffffffffffffffffffff", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0", "title": "Red Hat Enterprise Linux (0-rescue-ffffffffffffffffffffffffffffffff) 9.0 (Plow)", "version": "0-rescue-ffffffffffffffffffffffffffffffff" }, @@ -12103,7 +12103,7 @@ "grub_users": "$grub_users", "initrd": "/initramfs-5.14.0-4.el9.x86_64.img $tuned_initrd", "linux": "/vmlinuz-5.14.0-4.el9.x86_64", - "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 crashkernel=auto $tuned_params", + "options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 console=tty0 console=ttyS0,115200n8 no_timer_check net.ifnames=0 $tuned_params", "title": "Red Hat Enterprise Linux (5.14.0-4.el9.x86_64) 9.0 (Plow)", "version": "5.14.0-4.el9.x86_64" }