diff options
| author |  Jeremy Cline <jeremycline@linux.microsoft.com>
| 2025-05-27 09:52:54 -0400 |
|---|---|---|
| committer | Jeremy Cline <jeremycline@linux.microsoft.com>
| 2025-05-29 16:17:08 -0400 |
| commit | 5c2fc05a284f7e48d5f357823953891e846dd807 (patch) | |
| tree | 851464be0b7115a0855c979d2472db9691f3eb47 /teams | |
| parent | 56a4d1ed1ab8c0e382667ee09c6a040c4b9cf0d9 (diff) | |
| download | kiwi-descriptions-5c2fc05a284f7e48d5f357823953891e846dd807.tar.gz kiwi-descriptions-5c2fc05a284f7e48d5f357823953891e846dd807.zip | |
ELN: Adjust aarch64 images to use the correct serial console
The serial device name on Arm is ttyAMA, not ttyS. This splits the
configuration for ELN images based on the architecture and adjusts the
kernel command line.
Note that prior to this change, aarch64 would still output kernel logs
to the ttyAMA0 console (on Azure, at least) due to the ACPI SPCR table.
On aarch64 the console in this table, if it's present, is _always_
configured as the kernel's default console. However, systemd logs would
not be sent to the serial console because it seems it was honoring the
kernel command line configuration which had ttyS0 as the default.
Note: this is the exact same change as 4979662a547e ("Cloud: Adjust
aarch64 images to use the correct serial console"), if you're reverting
this, you probably want to also revert that one.
Also see: https://pagure.io/cloud-sig/issue/394
Also see: https://bugzilla.redhat.com/show_bug.cgi?id=1661288
Signed-off-by: Jeremy Cline <jeremycline@linux.microsoft.com>
Diffstat (limited to 'teams')
| -rw-r--r-- | teams/eln/cloud.xml | 69 |
1 files changed, 65 insertions, 4 deletions
diff --git a/teams/eln/cloud.xml b/teams/eln/cloud.xml index 090b7b5..2c71043 100644 --- a/teams/eln/cloud.xml +++ b/teams/eln/cloud.xml @@ -28,7 +28,7 @@ <requires profile="Cloud-Base-Generic"/> </profile> </profiles> - <preferences profiles="Cloud-Base-Azure" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-Azure" arch="x86_64"> <type image="oem" format="vhd-fixed" formatoptions="force_size" filesystem="xfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0 systemd.firstboot=off" @@ -43,7 +43,22 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-Azure" arch="aarch64"> + <type image="oem" format="vhd-fixed" formatoptions="force_size" + filesystem="xfs" + kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 earlyprintk=ttyAMA0 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" console="serial" timeout="0"/> + <size unit="G">5</size> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64"> <type image="oem" filesystem="xfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" @@ -58,7 +73,22 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-GCE" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-AmazonEC2" arch="aarch64"> + <type image="oem" + filesystem="xfs" + kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" timeout="0"/> + <size unit="G">5</size> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-GCE" arch="x86_64"> <type image="oem" format="gce" filesystem="xfs" kernelcmdline="no_timer_check console=ttyS0,38400n8d systemd.firstboot=off" @@ -74,7 +104,23 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-GCE" arch="aarch64"> + <type image="oem" format="gce" + filesystem="xfs" + kernelcmdline="no_timer_check console=ttyAMA0,38400n8d systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" timeout="0"/> + <!-- GCP engineers have told us the disk images have bad performance if they are anything less than 10G --> + <size unit="G">10</size> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-Generic" arch="x86_64"> <type image="oem" format="qcow2" filesystem="xfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" @@ -89,6 +135,21 @@ </oemconfig> </type> </preferences> + <preferences profiles="Cloud-Base-Generic" arch="aarch64"> + <type image="oem" format="qcow2" + filesystem="xfs" + kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" console="serial" timeout="0"/> + <size unit="G">5</size> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> <preferences profiles="Cloud-Base-Generic" arch="ppc64le"> <type image="oem" format="qcow2" filesystem="xfs" |