From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 19 May 2023 13:58:18 +0000 (+0200)
Subject: units: order sysinit.target, debug-shell.service after systemd-vconsole-setup
X-Git-Tag: v254-rc1~421^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F27703%2Fhead;p=thirdparty%2Fsystemd.git

units: order sysinit.target, debug-shell.service after systemd-vconsole-setup

Previous patch to add an implicit dependency effectively orders various getty
services after systemd-vconsole-setup.service. But I think it's cleaner to also
order the service before sysinit.target, like it was before
8125e8d38e3aa099c7dce8b0161997b8842aebdc. There might be units which don't do
use TTYVHangup= but would like to have the console fully initialized.

Also, add a manual ordering to debug-shell.service, because it has
ImplicitDependencies=no. This might delay debug-shell.service a bit, but
systemd-vconsole-setup.service has no dependencies and should be very quick, so
this should not be noticable in practice. Without the ordering, the terminal
might not have a key map loaded, making debug-shell.service hard to use.
---

diff --git a/units/debug-shell.service.in b/units/debug-shell.service.in
index 1588bb95966..2c2c8dd4f5f 100644
--- a/units/debug-shell.service.in
+++ b/units/debug-shell.service.in
@@ -13,6 +13,7 @@ Documentation=man:systemd-debug-generator(8)
 DefaultDependencies=no
 IgnoreOnIsolate=yes
 ConditionPathExists={{DEBUGTTY}}
+After=systemd-vconsole-setup.service
 
 [Service]
 Environment=TERM=linux
diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in
index c07869feddd..00095283075 100644
--- a/units/systemd-vconsole-setup.service.in
+++ b/units/systemd-vconsole-setup.service.in
@@ -11,6 +11,7 @@
 Description=Setup Virtual Console
 Documentation=man:systemd-vconsole-setup.service(8) man:vconsole.conf(5)
 DefaultDependencies=no
+Before=sysinit.target
 Before=initrd-switch-root.target shutdown.target
 ConditionPathExists=/dev/tty0