From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 19 May 2023 13:05:30 +0000 (+0200)
Subject: units: order getty units after getty-pre.target unconditionally
X-Git-Tag: v254-rc1~421^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce0fe01f22ea7907aef94329f0f641849fe020b3;p=thirdparty%2Fsystemd.git

units: order getty units after getty-pre.target unconditionally

Those two units had this ordering conditionalized on HAVE_SYSV_COMPAT. This
seems strange. 45e27532971ac84e835a2879df510a581f933fcd added the ordering
differently for those two files without any comment, and I think it was just
pasted or scripted erroneously.
---

diff --git a/units/console-getty.service.in b/units/console-getty.service.in
index 606b7dbe16b..d7e90ed8479 100644
--- a/units/console-getty.service.in
+++ b/units/console-getty.service.in
@@ -10,9 +10,9 @@
 [Unit]
 Description=Console Getty
 Documentation=man:agetty(8) man:systemd-getty-generator(8)
-After=systemd-user-sessions.service plymouth-quit-wait.service
+After=systemd-user-sessions.service plymouth-quit-wait.service getty-pre.target
 {% if HAVE_SYSV_COMPAT %}
-After=rc-local.service getty-pre.target
+After=rc-local.service
 {% endif %}
 Before=getty.target
 
diff --git a/units/container-getty@.service.in b/units/container-getty@.service.in
index 8d7e20d5ecf..b8c47d4dd06 100644
--- a/units/container-getty@.service.in
+++ b/units/container-getty@.service.in
@@ -11,9 +11,9 @@
 Description=Container Getty on /dev/pts/%I
 Documentation=man:agetty(8) man:systemd-getty-generator(8)
 Documentation=man:machinectl(1)
-After=systemd-user-sessions.service plymouth-quit-wait.service
+After=systemd-user-sessions.service plymouth-quit-wait.service getty-pre.target
 {% if HAVE_SYSV_COMPAT %}
-After=rc-local.service getty-pre.target
+After=rc-local.service
 {% endif %}
 Before=getty.target
 IgnoreOnIsolate=yes