From 8ab166acc01e12478d50e754dd8810224759cff2 Mon Sep 17 00:00:00 2001
From: hitechshell <hitechshell@mail.ru>
Date: Tue, 5 Mar 2024 20:36:39 +0500
Subject: [PATCH] main/postmarketos-base: change order of baud rate and tty
 name according to upstream (MR 4889)

[ci:skip-build]: already built successfully in CI
---
 main/postmarketos-base/APKBUILD                  | 2 +-
 main/postmarketos-base/postmarketos-base.trigger | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD
index b90fa49be..6d623a35e 100644
--- a/main/postmarketos-base/APKBUILD
+++ b/main/postmarketos-base/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=postmarketos-base
 pkgver=32
-pkgrel=1
+pkgrel=2
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://postmarketos.org"
 arch="noarch"
diff --git a/main/postmarketos-base/postmarketos-base.trigger b/main/postmarketos-base/postmarketos-base.trigger
index 5d9975a69..1c4a427b9 100644
--- a/main/postmarketos-base/postmarketos-base.trigger
+++ b/main/postmarketos-base/postmarketos-base.trigger
@@ -11,7 +11,7 @@ if [ -n "${deviceinfo_getty}" ]; then
 
 	if [ -n "${port}" ] && [ -n "${baudrate}" ]; then
 		echo "Configuring a getty on port ${port} with baud rate ${baudrate}"
-		sed -i -e "s/#ttyS0::respawn:\/sbin\/getty -L ttyS0 115200 vt100/${port}::respawn:\/sbin\/getty -L ${port} ${baudrate} vt100/" /etc/inittab
+		sed -i -e "s/#ttyS0::respawn:\/sbin\/getty -L 115200 ttyS0 vt100/${port}::respawn:\/sbin\/getty -L ${baudrate} ${port} vt100/" /etc/inittab
 	else
 		echo "ERROR: Invalid value for deviceinfo_getty: ${deviceinfo_getty}"
 		exit 1