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=4b65d5b9062a3e1f0f49ee54ed29f7e182d16a3a;hp=72d4794da15153aff3c228bf27b4637c3553e7c9;hb=7376cffd56ccfbf7e81db16736bba69aa3036cc0;hpb=dfca381db341205b7a68f40ef2b7550ac6972cab

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 72d4794da..4b65d5b90 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -6,17 +6,38 @@
 #  (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
+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 (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.
 Before=getty.target
-After=basic.target
-Conflicts=shutdown.target
 
 [Service]
-Type=simple
-ExecStart=GETTY %I
+Environment=TERM=linux
+ExecStart=-GETTY %I
 Restart=restart-always
 RestartSec=0
+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