From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 19 Jul 2022 08:37:05 +0000 (+0200)
Subject: units: Simplify container getty handling
X-Git-Tag: v252-rc1~563
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=219fa78b5fa2ec9c13dd87419366116e3197693f;p=thirdparty%2Fsystemd.git

units: Simplify container getty handling

Let's remove the baud settings for the container getty units since
they don't have any effect there anyway. On top of that, when we're
dealing with container TTYs, we can handle all the setup involved
ourselves so let's prevent agetty/login from touching the container
tty at all.

One example where this helps is that it actually makes disabling
TTYVHangup have an effect since before, login would unconditionally
call vhangup() on the tty.
---

diff --git a/units/console-getty.service.in b/units/console-getty.service.in
index 73871d6f50a..606b7dbe16b 100644
--- a/units/console-getty.service.in
+++ b/units/console-getty.service.in
@@ -20,9 +20,8 @@ Before=getty.target
 ConditionPathExists=/dev/console
 
 [Service]
-# The '-o' option value tells agetty to replace 'login' arguments with an
-# option to preserve environment (-p), followed by '--' for safety, and then
-# the entered username.
+# The '-o' option value tells agetty to replace 'login' arguments with an option to preserve environment (-p),
+# followed by '--' for safety, and then the entered username.
 ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM
 Type=idle
 Restart=always
diff --git a/units/container-getty@.service.in b/units/container-getty@.service.in
index a6e3f94e2a5..8d7e20d5ecf 100644
--- a/units/container-getty@.service.in
+++ b/units/container-getty@.service.in
@@ -25,10 +25,9 @@ Conflicts=rescue.service
 Before=rescue.service
 
 [Service]
-# The '-o' option value tells agetty to replace 'login' arguments with an
-# option to preserve environment (-p), followed by '--' for safety, and then
-# the entered username.
-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM
+# The '-o' option value tells agetty to replace 'login' arguments with an option to preserve environment (-p),
+# followed by '--' for safety, and then the entered username.
+ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear - $TERM
 Type=idle
 Restart=always
 RestartSec=0