From: Daan De Meyer Date: Fri, 15 Dec 2023 14:22:41 +0000 (+0100) Subject: Add default serial tty for s390(x) X-Git-Tag: v20~58^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aeaa082d5088e5ee04578b11eba268c7e764810b;p=thirdparty%2Fmkosi.git Add default serial tty for s390(x) --- diff --git a/mkosi/__init__.py b/mkosi/__init__.py index 277aa2757..b4753c5c1 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -312,8 +312,9 @@ def configure_autologin(state: MkosiState) -> None: configure_autologin_service(state, "serial-getty@ttyS0.service", "--keep-baud 115200,57600,38400,9600 -") - if state.config.architecture == Architecture.arm64: - configure_autologin_service(state, "serial-getty@ttyAMA0.service", + if state.config.architecture.default_serial_tty() != "ttyS0": + configure_autologin_service(state, + f"serial-getty@{state.config.architecture.default_serial_tty()}.service", "--keep-baud 115200,57600,38400,9600 -") diff --git a/mkosi/architecture.py b/mkosi/architecture.py index 5f1cfe968..460be8617 100644 --- a/mkosi/architecture.py +++ b/mkosi/architecture.py @@ -121,6 +121,8 @@ class Architecture(StrEnum): return { Architecture.arm : "ttyAMA0", Architecture.arm64 : "ttyAMA0", + Architecture.s390 : "ttysclp0", + Architecture.s390x : "ttysclp0", }.get(self, "ttyS0") def supports_smbios(self) -> bool: