Merge pull request #35 from steveb/OSPRH-8037

steveb · web-flow · commit ce46873d0abf · 2024-06-27T10:43:36.000+12:00
Set DIB_BOOTLOADER_USE_SERIAL_CONSOLE to false
diff --git a/images/edpm-hardened-uefi-centos-9-stream.yaml b/images/edpm-hardened-uefi-centos-9-stream.yaml
@@ -33,3 +33,4 @@
     DIB_MODPROBE_BLACKLIST: 'usb-storage cramfs freevxfs jffs2 hfs hfsplus squashfs udf bluetooth'
     DIB_BOOTLOADER_DEFAULT_CMDLINE: 'rd.multipath=default'
     DIB_BOOTLOADER_VIRTUAL_TERMINAL: ''
+    DIB_BOOTLOADER_USE_SERIAL_CONSOLE: 'False'
diff --git a/images/edpm-hardened-uefi-rhel-9.yaml b/images/edpm-hardened-uefi-rhel-9.yaml
@@ -29,7 +29,6 @@
     DIB_DHCP_TIMEOUT: '60'
     DIB_IMAGE_SIZE: '5'
     DIB_MODPROBE_BLACKLIST: 'usb-storage cramfs freevxfs jffs2 hfs hfsplus squashfs udf bluetooth'
-    # TODO remove memtest=0 when this change is available:
-    # https://review.opendev.org/c/openstack/diskimage-builder/+/884644
-    DIB_BOOTLOADER_DEFAULT_CMDLINE: 'memtest=0'
+    DIB_BOOTLOADER_DEFAULT_CMDLINE: 'rd.multipath=default'
     DIB_BOOTLOADER_VIRTUAL_TERMINAL: ''
+    DIB_BOOTLOADER_USE_SERIAL_CONSOLE: 'False'
