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=31e8415c0367d4c1c4bf4aed18ef96818531771f;hb=180f90cb13ffbf8e6269ec3afb24243fec936e0c;hpb=cfe243e3720062c2e0eecd8bb0bdd7b4059e156d

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 31e8415c0..902ab6e05 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -5,19 +5,33 @@
 #  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_dnl
 [Unit]
 Description=Getty on %I
+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_ARCH',
+After=rc-local.service
+)m4_dnl
+
+# 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
-After=basic.target
-Conflicts=shutdown.target
 
 [Service]
-Type=simple
-ExecStart=GETTY %I
-Restart=restart-always
+Environment=TERM=linux
+ExecStart=-/sbin/agetty %I 38400
+Restart=always
 RestartSec=0
+UtmpIdentifier=%I
+KillMode=process-group
+
+# Some login implementations ignore SIGTERM, so we send SIGHUP
+# instead, to ensure that login terminates cleanly.
+KillSignal=SIGHUP
+
+[Install]
+Alias=getty.target.wants/getty@tty1.service getty.target.wants/getty@tty2.service getty.target.wants/getty@tty3.service getty.target.wants/getty@tty4.service getty.target.wants/getty@tty5.service getty.target.wants/getty@tty6.service