image: move idle and nosmt to aws-only images (#2297)

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.
This commit is contained in:
Otto Bittner 2023-09-04 14:02:10 +02:00 committed by GitHub
parent ecfb6d9b1f
commit cb934ed087
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 2 deletions

0
image/.csp/aws Normal file
View File

View File

@ -1,2 +1,5 @@
[Match] [Match]
PathExists=../.csp/aws PathExists=../.csp/aws
[Output]
KernelCommandLine=mitigations=auto idle=poll

View File

@ -1,2 +1,5 @@
[Match] [Match]
PathExists=../.csp/azure PathExists=../.csp/azure
[Output]
KernelCommandLine=mitigations=auto,nosmt

View File

@ -6,7 +6,7 @@ Release=38
Format=disk Format=disk
ManifestFormat=json,changelog ManifestFormat=json,changelog
Bootable=yes 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 SplitArtifacts=yes
# Enable Secure Boot with own PKI # Enable Secure Boot with own PKI
SecureBoot=yes SecureBoot=yes

View File

@ -1,2 +1,5 @@
[Match] [Match]
PathExists=../.csp/gcp PathExists=../.csp/gcp
[Output]
KernelCommandLine=mitigations=auto,nosmt

View File

@ -2,7 +2,7 @@
PathExists=../.csp/openstack PathExists=../.csp/openstack
[Output] [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] [Content]
Autologin=yes Autologin=yes

View File

@ -4,3 +4,6 @@ PathExists=../.csp/qemu
[Content] [Content]
Autologin=yes Autologin=yes
Environment=CONSOLE_MOTD=true Environment=CONSOLE_MOTD=true
[Output]
KernelCommandLine=mitigations=auto,nosmt