From 5c1530ee53fec2649eda24bd635e4a75275b12e2 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Tue, 31 May 2022 00:27:09 +0200
Subject: [PATCH] distro/rhel90: blacklist skx_edac,intel_cstate kernel modules
 on azure

Disabled by the MSFT images, we follow suit (really means we don't
exactly know why and should find out).
---
 internal/distro/rhel90/distro.go              | 12 ++++++++++
 .../rhel_90-x86_64-azure_rhui-boot.json       | 24 +++++++++++++++++++
 .../rhel_91-x86_64-azure_rhui-boot.json       | 24 +++++++++++++++++++
 3 files changed, 60 insertions(+)

diff --git a/internal/distro/rhel90/distro.go b/internal/distro/rhel90/distro.go
index aff6f89cd..2a89db47b 100644
--- a/internal/distro/rhel90/distro.go
+++ b/internal/distro/rhel90/distro.go
@@ -948,6 +948,18 @@ func newDistro(distroName string) distro.Distro {
 						osbuild.NewModprobeConfigCmdBlacklist("floppy"),
 					},
 				},
+				{
+					Filename: "blacklist-skylake-edac.conf",
+					Commands: osbuild.ModprobeConfigCmdList{
+						osbuild.NewModprobeConfigCmdBlacklist("skx_edac"),
+					},
+				},
+				{
+					Filename: "blacklist-intel-cstate.conf",
+					Commands: osbuild.ModprobeConfigCmdList{
+						osbuild.NewModprobeConfigCmdBlacklist("intel_cstate"),
+					},
+				},
 			},
 			CloudInit: []*osbuild.CloudInitStageOptions{
 				{
diff --git a/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json
index 449569191..c08fc872c 100644
--- a/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_90-x86_64-azure_rhui-boot.json
@@ -2726,6 +2726,30 @@
               ]
             }
           },
+          {
+            "type": "org.osbuild.modprobe",
+            "options": {
+              "filename": "blacklist-skylake-edac.conf",
+              "commands": [
+                {
+                  "command": "blacklist",
+                  "modulename": "skx_edac"
+                }
+              ]
+            }
+          },
+          {
+            "type": "org.osbuild.modprobe",
+            "options": {
+              "filename": "blacklist-intel-cstate.conf",
+              "commands": [
+                {
+                  "command": "blacklist",
+                  "modulename": "intel_cstate"
+                }
+              ]
+            }
+          },
           {
             "type": "org.osbuild.sshd.config",
             "options": {
diff --git a/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json
index b459e23f8..4860374cf 100644
--- a/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json
+++ b/test/data/manifests/rhel_91-x86_64-azure_rhui-boot.json
@@ -6912,6 +6912,30 @@
               ]
             }
           },
+          {
+            "type": "org.osbuild.modprobe",
+            "options": {
+              "filename": "blacklist-skylake-edac.conf",
+              "commands": [
+                {
+                  "command": "blacklist",
+                  "modulename": "skx_edac"
+                }
+              ]
+            }
+          },
+          {
+            "type": "org.osbuild.modprobe",
+            "options": {
+              "filename": "blacklist-intel-cstate.conf",
+              "commands": [
+                {
+                  "command": "blacklist",
+                  "modulename": "intel_cstate"
+                }
+              ]
+            }
+          },
           {
             "type": "org.osbuild.sshd.config",
             "options": {