Skip to content

Commit

Permalink
image: move idle and nosmt to aws-only images
Browse files Browse the repository at this point in the history
We don't want these options on other CSPs. This is temporary until AWS
fixed some background issues.
We need to set the option we want to set differently on each provider
once per provider as we need to keep some of the options we set with
higher priority.
  • Loading branch information
derpsteb committed Sep 4, 2023
1 parent 75ce11a commit e5a8c3e
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 2 deletions.
Empty file added image/.csp/aws
Empty file.
3 changes: 3 additions & 0 deletions image/mkosi.conf.d/mkosi.aws.conf
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[Match]
PathExists=../.csp/aws

[Output]
KernelCommandLine=mitigations=auto idle=poll
3 changes: 3 additions & 0 deletions image/mkosi.conf.d/mkosi.azure.conf
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[Match]
PathExists=../.csp/azure

[Output]
KernelCommandLine=mitigations=auto,nosmt
2 changes: 1 addition & 1 deletion image/mkosi.conf.d/mkosi.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Release=38
Format=disk
ManifestFormat=json,changelog
Bootable=yes
KernelCommandLine=mitigations=auto idle=poll preempt=full rd.shell=0 rd.emergency=reboot loglevel=8 console=ttyS0
KernelCommandLine=preempt=full rd.shell=0 rd.emergency=reboot loglevel=8 console=ttyS0
SplitArtifacts=yes
# Enable Secure Boot with own PKI
SecureBoot=yes
Expand Down
3 changes: 3 additions & 0 deletions image/mkosi.conf.d/mkosi.gcp.conf
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[Match]
PathExists=../.csp/gcp

[Output]
KernelCommandLine=mitigations=auto,nosmt
2 changes: 1 addition & 1 deletion image/mkosi.conf.d/mkosi.openstack.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
PathExists=../.csp/openstack

[Output]
KernelCommandLine=mem_encrypt=on kvm_amd.sev=1 module_blacklist=qemu_fw_cfg console=tty0 console=ttyS0
KernelCommandLine=mem_encrypt=on kvm_amd.sev=1 module_blacklist=qemu_fw_cfg console=tty0 console=ttyS0 mitigations=auto,nosmt

[Content]
Autologin=yes
Expand Down
3 changes: 3 additions & 0 deletions image/mkosi.conf.d/mkosi.qemu.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ PathExists=../.csp/qemu
[Content]
Autologin=yes
Environment=CONSOLE_MOTD=true

[Output]
KernelCommandLine=mitigations=auto,nosmt

0 comments on commit e5a8c3e

Please sign in to comment.