From 1f922085fc33f378cc6c5259c83dbccc7494ae39 Mon Sep 17 00:00:00 2001
From: Lee Yarwood <lyarwood@redhat.com>
Date: Wed, 13 Sep 2023 18:55:53 +0100
Subject: [PATCH] centos.stream9: Remove EFI and secureboot support

The current cloud images do not support UEFI boot so for now the
perferences to enable EFI and secureboot are being removed from the
centos.stream9 preference to avoid confusion.

$ virt-filesystems -a CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2 --all --long --uuid -h
Name      Type       VFS Label MBR Size Parent   UUID
/dev/sda1 filesystem xfs -     -   7.8G -        a2e35d7f-1574-4fc3-aebd-5e60991d3841
/dev/sda1 partition  -   -     83  7.8G /dev/sda -
/dev/sda  device     -   -     -   10G  -        -

Signed-off-by: Lee Yarwood <lyarwood@redhat.com>
---
 common-clusterpreferences-bundle.yaml         | 10 ----------
 common-instancetypes-all-bundle.yaml          | 20 -------------------
 .../centos/9_stream/kustomization.yaml        |  1 -
 common-preferences-bundle.yaml                | 10 ----------
 4 files changed, 41 deletions(-)

diff --git a/common-clusterpreferences-bundle.yaml b/common-clusterpreferences-bundle.yaml
index cfc1d74b..1b6bdda4 100644
--- a/common-clusterpreferences-bundle.yaml
+++ b/common-clusterpreferences-bundle.yaml
@@ -145,11 +145,6 @@ spec:
     preferredDiskDedicatedIoThread: true
     preferredInterfaceModel: virtio
     preferredRng: {}
-  features:
-    preferredSmm: {}
-  firmware:
-    preferredUseEfi: true
-    preferredUseSecureBoot: true
   requirements:
     cpu:
       guest: 1
@@ -179,11 +174,6 @@ spec:
     preferredInputType: tablet
     preferredInterfaceModel: virtio
     preferredRng: {}
-  features:
-    preferredSmm: {}
-  firmware:
-    preferredUseEfi: true
-    preferredUseSecureBoot: true
   requirements:
     cpu:
       guest: 1
diff --git a/common-instancetypes-all-bundle.yaml b/common-instancetypes-all-bundle.yaml
index 00884d48..b9519a90 100644
--- a/common-instancetypes-all-bundle.yaml
+++ b/common-instancetypes-all-bundle.yaml
@@ -1127,11 +1127,6 @@ spec:
     preferredDiskDedicatedIoThread: true
     preferredInterfaceModel: virtio
     preferredRng: {}
-  features:
-    preferredSmm: {}
-  firmware:
-    preferredUseEfi: true
-    preferredUseSecureBoot: true
   requirements:
     cpu:
       guest: 1
@@ -1161,11 +1156,6 @@ spec:
     preferredInputType: tablet
     preferredInterfaceModel: virtio
     preferredRng: {}
-  features:
-    preferredSmm: {}
-  firmware:
-    preferredUseEfi: true
-    preferredUseSecureBoot: true
   requirements:
     cpu:
       guest: 1
@@ -3243,11 +3233,6 @@ spec:
     preferredDiskDedicatedIoThread: true
     preferredInterfaceModel: virtio
     preferredRng: {}
-  features:
-    preferredSmm: {}
-  firmware:
-    preferredUseEfi: true
-    preferredUseSecureBoot: true
   requirements:
     cpu:
       guest: 1
@@ -3277,11 +3262,6 @@ spec:
     preferredInputType: tablet
     preferredInterfaceModel: virtio
     preferredRng: {}
-  features:
-    preferredSmm: {}
-  firmware:
-    preferredUseEfi: true
-    preferredUseSecureBoot: true
   requirements:
     cpu:
       guest: 1
diff --git a/common-instancetypes/preferences/centos/9_stream/kustomization.yaml b/common-instancetypes/preferences/centos/9_stream/kustomization.yaml
index 4b0fbc2b..1cb5ff12 100644
--- a/common-instancetypes/preferences/centos/9_stream/kustomization.yaml
+++ b/common-instancetypes/preferences/centos/9_stream/kustomization.yaml
@@ -9,7 +9,6 @@ components:
   - ./metadata
   - ./requirements
   - ../../components/rng
-  - ../../components/secureboot
   - ../../components/disk-dedicatediothread
 
 nameSuffix: ".stream9"
diff --git a/common-preferences-bundle.yaml b/common-preferences-bundle.yaml
index 8923278a..7bc0c362 100644
--- a/common-preferences-bundle.yaml
+++ b/common-preferences-bundle.yaml
@@ -145,11 +145,6 @@ spec:
     preferredDiskDedicatedIoThread: true
     preferredInterfaceModel: virtio
     preferredRng: {}
-  features:
-    preferredSmm: {}
-  firmware:
-    preferredUseEfi: true
-    preferredUseSecureBoot: true
   requirements:
     cpu:
       guest: 1
@@ -179,11 +174,6 @@ spec:
     preferredInputType: tablet
     preferredInterfaceModel: virtio
     preferredRng: {}
-  features:
-    preferredSmm: {}
-  firmware:
-    preferredUseEfi: true
-    preferredUseSecureBoot: true
   requirements:
     cpu:
       guest: 1