X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Fgetty%40.service.m4;h=902ab6e0538d81e057c1bde777d5603ea7ab3ebf;hp=01343c497fe277614551b7ab0b4929dfb07d6fe2;hb=a45b9fd09442eb75d39e3419c1fced90c7e339e7;hpb=9f24a81068b69e1670d685c4917a5f9f3074d845

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 01343c497..902ab6e05 100644
--- 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.
 
-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
-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
@@ -22,17 +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=linux
-ExecStart=GETTY %I
-Restart=restart-always
+ExecStart=-/sbin/agetty %I 38400
+Restart=always
 RestartSec=0
+UtmpIdentifier=%I
 KillMode=process-group
 
 # Some login implementations ignore SIGTERM, so we send SIGHUP