particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro/rhel7: blacklist skx_edac,intel_cstate kernel modules on azure

Browse source 
This was done in RHEL 8, 9 but RHEL 7 was not yet merged so this was
missed there. See e.g. 5c1530ee53
This commit is contained in:
Christian Kellner 2022-07-26 10:30:50 +02:00 • committed by Tom Gundersen
parent c78c69b273
commit e3de1d03c0
2 changed files with 58 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
internal/distro/rhel7/azure.go
View file

@ -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"),
},
},
},

40
test/data/manifests/rhel_7-x86_64-azure_rhui-boot.json
View file

@ -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"
}
]
}