Add default serial tty for s390(x)

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 277aa275760adbe8b1e56d1cd39e62a51bcbfcac..b4753c5c137dc6d9948b5b8b36ed8b07f42ef5cf 100644 (file)
--- 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 5f1cfe968c36c64602f6f412d3986cbcdfb54b15..460be8617566c5b09a63e4915c240ff31ff1ec1a 100644 (file)
--- 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: