image: special case OpenStack serial console to include ttyS1

This commit is contained in:
Malte Poll 2024-03-06 12:12:19 +01:00
parent f94b00fe7c
commit 56460f0d63
2 changed files with 6 additions and 3 deletions

View File

@ -13,7 +13,7 @@ Seed=0e9a6fe0-68f6-408c-bbeb-136054d20445
SourceDateEpoch=0 SourceDateEpoch=0
Bootable=yes Bootable=yes
Bootloader=uki Bootloader=uki
KernelCommandLine=preempt=full rd.shell=0 rd.emergency=reboot loglevel=8 console=ttyS0 KernelCommandLine=preempt=full rd.shell=0 rd.emergency=reboot loglevel=8
RemoveFiles=/var/log RemoveFiles=/var/log
RemoveFiles=/var/cache RemoveFiles=/var/cache
RemoveFiles=/etc/pki/ca-trust/extracted/java/cacerts RemoveFiles=/etc/pki/ca-trust/extracted/java/cacerts

View File

@ -55,6 +55,7 @@ base_cmdline = "selinux=1 enforcing=0 audit=0"
csp_settings = { csp_settings = {
"aws": { "aws": {
"kernel_command_line_dict": { "kernel_command_line_dict": {
"console": "ttyS0",
"constel.csp": "aws", "constel.csp": "aws",
"idle": "poll", "idle": "poll",
"mitigations": "auto", "mitigations": "auto",
@ -62,20 +63,21 @@ csp_settings = {
}, },
"azure": { "azure": {
"kernel_command_line_dict": { "kernel_command_line_dict": {
"console": "ttyS0",
"constel.csp": "azure", "constel.csp": "azure",
"mitigations": "auto,nosmt", "mitigations": "auto,nosmt",
}, },
}, },
"gcp": { "gcp": {
"kernel_command_line_dict": { "kernel_command_line_dict": {
"console": "ttyS0",
"constel.csp": "gcp", "constel.csp": "gcp",
"mitigations": "auto,nosmt", "mitigations": "auto,nosmt",
}, },
}, },
"openstack": { "openstack": {
"kernel_command_line": "console=tty0 console=ttyS0", "kernel_command_line": "console=tty0 console=ttyS0 console=ttyS1",
"kernel_command_line_dict": { "kernel_command_line_dict": {
"console": "tty0",
"constel.csp": "openstack", "constel.csp": "openstack",
"kvm_amd.sev": "1", "kvm_amd.sev": "1",
"mem_encrypt": "on", "mem_encrypt": "on",
@ -86,6 +88,7 @@ csp_settings = {
"qemu": { "qemu": {
"autologin": True, "autologin": True,
"kernel_command_line_dict": { "kernel_command_line_dict": {
"console": "ttyS0",
"constel.csp": "qemu", "constel.csp": "qemu",
"mitigations": "auto,nosmt", "mitigations": "auto,nosmt",
}, },