build-sys: prepare release v18

[elogind.git] / units / serial-getty@.service.m4

diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
index b91ed98330bad596faf42fc6e9808c89a179dd6d..c7a11b1fa0c987e4d81df2e81a4013e6a6448da0 100644 (file)
--- a/units/serial-getty@.service.m4
+++ b/units/serial-getty@.service.m4
@@ -7,8 +7,8 @@
 
 [Unit]
 Description=Serial Getty on %I
-Requires=dev-%i.device
-After=dev-%i.device
+BindTo=dev-%i.device
+After=dev-%i.device systemd-user-sessions.service
 m4_ifdef(`TARGET_FEDORA',
 After=rc-local.service
 )m4_dnl
@@ -16,20 +16,17 @@ m4_ifdef(`TARGET_ARCH',
 After=rc-local.service
 )m4_dnl
 
-# If additional gettys are spawned during boot (possibly by
-# systemd-auto-console-getty) then we should make sure that this is
-# synchronized before getty.target, even though getty.target didn't
-# actually pull it in.
+# If additional gettys are spawned during boot then we should make
+# sure that this is synchronized before getty.target, even though
+# getty.target didn't actually pull it in.
 Before=getty.target
 
 [Service]
-Environment=TERM=vt100-nav
-m4_ifdef(`TARGET_FEDORA',
-ExecStartPre=-/sbin/securetty %I
-)m4_dnl
+Environment=TERM=vt100
 ExecStart=-/sbin/agetty -s %I 115200,38400,9600
-Restart=restart-always
+Restart=always
 RestartSec=0
+UtmpIdentifier=%I
 KillMode=process-group
 
 # Some login implementations ignore SIGTERM, so we send SIGHUP