From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 18 Sep 2025 15:50:06 +0000 (+0200)
Subject: units: explicitly reset TTY before running stuff on console
X-Git-Tag: v259-rc1~515
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c9500c2b7f84e8f3e0434b0dc7b18ae4da50e6c;p=thirdparty%2Fsystemd.git

units: explicitly reset TTY before running stuff on console

This adds TTYReset=yes to all units which run directly on the TTY. We
already had this in place for the gettys, but this adds it for the rest
that basically has StandardInput=tty + StandardOutput=tty set.

Originally, for these tools it wasn't necessary to reset the TTY,
because we after all already reset /dev/console very very early on once,
during PID1's early initialization, and hence there's no real reason to
do it again for these early boot services. But that's actually not
right, because since #36666 the TTY we reset from PID 1 is typically
/dev/console but the TTY those services are invoked on is typically the
resolved version of that, i.e. wherever that points. Now you might
think: if one is just an alias to the other, why does it matter to reset
this again? Well, because it's only a half-assed alias, and as it turns
out WIOCSWINSZ is not propagated from one to the other, i.e the terminal
dimesions we initialize for /dev/console don't propagate to whatever
that points to.

One option to address that would be to immediately propagate this down
ourselves (or to fix the kernel for it), but it felt safer to simply do
the reset again before the use, after all these one one-off services,
and there's no point in optimizing much here. Moreover, its probably
safer to give the guarantee that when the firstboot stuff (which after
all queries for pws to set) runs it definitely certainly guaranteed has
a properly reset terminal.
---

diff --git a/units/systemd-firstboot.service b/units/systemd-firstboot.service
index 15b7744289b..31f02a8e00b 100644
--- a/units/systemd-firstboot.service
+++ b/units/systemd-firstboot.service
@@ -35,6 +35,7 @@ ExecStart=systemd-firstboot --prompt-locale --prompt-keymap --prompt-timezone --
 StandardOutput=tty
 StandardInput=tty
 StandardError=tty
+TTYReset=yes
 
 # Optionally, pick up basic fields from credentials passed to the service
 # manager. This is useful for importing this data from nspawn's
diff --git a/units/systemd-homed-firstboot.service b/units/systemd-homed-firstboot.service
index 3615940a4ec..444ec3055d5 100644
--- a/units/systemd-homed-firstboot.service
+++ b/units/systemd-homed-firstboot.service
@@ -21,6 +21,7 @@ ExecStart=homectl firstboot --prompt-new-user
 StandardOutput=tty
 StandardInput=tty
 StandardError=tty
+TTYReset=yes
 ImportCredential=home.*
 
 [Install]
diff --git a/units/systemd-storagetm.service.in b/units/systemd-storagetm.service.in
index 22770bf291c..60cd56933ef 100644
--- a/units/systemd-storagetm.service.in
+++ b/units/systemd-storagetm.service.in
@@ -24,4 +24,5 @@ Type=notify
 RemainAfterExit=yes
 StandardInput=tty
 StandardOutput=tty
+TTYReset=yes
 ExecStart={{LIBEXECDIR}}/systemd-storagetm --all