diff --git a/internal/distro/rhel7/azure.go b/internal/distro/rhel7/azure.go index 958406ce5..5210d9505 100644 --- a/internal/distro/rhel7/azure.go +++ b/internal/distro/rhel7/azure.go @@ -256,6 +256,24 @@ var azureRhuiImgType = imageType{ }, }, Modprobe: []*osbuild.ModprobeStageOptions{ + { + Filename: "blacklist-amdgpu.conf", + Commands: osbuild.ModprobeConfigCmdList{ + osbuild.NewModprobeConfigCmdBlacklist("amdgpu"), + }, + }, + { + Filename: "blacklist-intel-cstate.conf", + Commands: osbuild.ModprobeConfigCmdList{ + osbuild.NewModprobeConfigCmdBlacklist("intel_cstate"), + }, + }, + { + Filename: "blacklist-floppy.conf", + Commands: osbuild.ModprobeConfigCmdList{ + osbuild.NewModprobeConfigCmdBlacklist("floppy"), + }, + }, { Filename: "blacklist-nouveau.conf", Commands: osbuild.ModprobeConfigCmdList{ @@ -264,9 +282,9 @@ var azureRhuiImgType = imageType{ }, }, { - Filename: "blacklist-floppy.conf", + Filename: "blacklist-skylake-edac.conf", Commands: osbuild.ModprobeConfigCmdList{ - osbuild.NewModprobeConfigCmdBlacklist("floppy"), + osbuild.NewModprobeConfigCmdBlacklist("skx_edac"), }, }, }, diff --git a/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json b/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json index 28ac15b54..0d9354750 100644 --- a/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json +++ b/test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json @@ -2379,6 +2379,42 @@ } } }, + { + "type": "org.osbuild.modprobe", + "options": { + "filename": "blacklist-amdgpu.conf", + "commands": [ + { + "command": "blacklist", + "modulename": "amdgpu" + } + ] + } + }, + { + "type": "org.osbuild.modprobe", + "options": { + "filename": "blacklist-intel-cstate.conf", + "commands": [ + { + "command": "blacklist", + "modulename": "intel_cstate" + } + ] + } + }, + { + "type": "org.osbuild.modprobe", + "options": { + "filename": "blacklist-floppy.conf", + "commands": [ + { + "command": "blacklist", + "modulename": "floppy" + } + ] + } + }, { "type": "org.osbuild.modprobe", "options": { @@ -2398,11 +2434,11 @@ { "type": "org.osbuild.modprobe", "options": { - "filename": "blacklist-floppy.conf", + "filename": "blacklist-skylake-edac.conf", "commands": [ { "command": "blacklist", - "modulename": "floppy" + "modulename": "skx_edac" } ] }