From 4bd1be1eafbd478b23e97c7884304816510f25c9 Mon Sep 17 00:00:00 2001
From: Gabe <redhatrises@gmail.com>
Date: Tue, 29 Sep 2020 13:41:07 -0600
Subject: [PATCH] Remove standard profile for RHCOS

---
 rhcos4/CMakeLists.txt        |  1 -
 rhcos4/profiles/ospp.profile | 16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/rhcos4/CMakeLists.txt b/rhcos4/CMakeLists.txt
index 34733191f3ed..f6c9d18a2ea6 100644
--- a/rhcos4/CMakeLists.txt
+++ b/rhcos4/CMakeLists.txt
@@ -10,7 +10,6 @@ set(PRODUCT_REMEDIATION_LANGUAGES "ignition;kubernetes")
 ssg_build_product(${PRODUCT})
 
 ssg_build_html_table_by_ref(${PRODUCT} "nist")
-ssg_build_html_nistrefs_table(${PRODUCT} "standard")
 ssg_build_html_nistrefs_table(${PRODUCT} "ospp")
 ssg_build_html_nistrefs_table(${PRODUCT} "stig")
 ssg_build_html_cce_table(${PRODUCT})
diff --git a/rhcos4/profiles/ospp.profile b/rhcos4/profiles/ospp.profile
index 4d44176bb740..9df62aabfae3 100644
--- a/rhcos4/profiles/ospp.profile
+++ b/rhcos4/profiles/ospp.profile
@@ -104,14 +104,14 @@ selections:
 
     ### Kernel Config
     ## Boot prompt
-    - grub2_audit_argument
-    - grub2_audit_backlog_limit_argument
-    - grub2_slub_debug_argument
-    - grub2_page_poison_argument
-    - grub2_vsyscall_argument
-    - grub2_vsyscall_argument.role=unscored
-    - grub2_vsyscall_argument.severity=info
-    - grub2_pti_argument
+    - coreos_audit_option
+    - coreos_audit_backlog_limit_kernel_argument
+    - coreos_slub_debug_kernel_argument
+    - coreos_page_poison_kernel_argument
+    - coreos_vsyscall_kernel_argument
+    - coreos_vsyscall_kernel_argument.role=unscored
+    - coreos_vsyscall_kernel_argument.severity=info
+    - coreos_pti_kernel_argument
 
     ## Security Settings
     - sysctl_kernel_kptr_restrict