units: delay getty until logins are allowed

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

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index be5916a155e4dfafaf58f665c4217bccfd8fb421..8ac3925c4f449843fea6516da71d737cedb16f35 100644 (file)
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -5,16 +5,10 @@
 #  the Free Software Foundation; either version 2 of the License, or
 #  (at your option) any later version.
 
 #  the Free Software Foundation; either version 2 of the License, or
 #  (at your option) any later version.
 

-m4_ifdef(`TARGET_FEDORA', `m4_define(`GETTY', `/sbin/mingetty')')m4_dnl
-m4_ifdef(`TARGET_SUSE', `m4_define(`GETTY', `/sbin/mingetty')')m4_dnl
-m4_ifdef(`TARGET_DEBIAN', `m4_define(`GETTY', `/sbin/getty 38400')')m4_dnl
-m4_ifdef(`TARGET_GENTOO', `m4_define(`GETTY', `/sbin/agetty 38400')')m4_dnl
-m4_ifdef(`TARGET_ARCH', `m4_define(`GETTY', `/sbin/agetty -8 38400')')m4_dnl
-m4_dnl

 [Unit]
 Description=Getty on %I
 [Unit]
 Description=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
 m4_ifdef(`TARGET_FEDORA',
 After=rc-local.service
 )m4_dnl


@@ -22,15 +16,13 @@ m4_ifdef(`TARGET_ARCH',
 After=rc-local.service
 )m4_dnl
 
 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]
 Before=getty.target
 
 [Service]

-Environment=TERM=linux
-ExecStart=-GETTY %I
+ExecStart=-/sbin/agetty %I 38400

 Restart=always
 RestartSec=0
 UtmpIdentifier=%I
 Restart=always
 RestartSec=0
 UtmpIdentifier=%I