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=770fc6caac588385c4a9e7809b81d9696645a567;hp=5f6944fadbe8dc8c0031889d8fc5b1a426dfa38c;hb=16061c20ddd8eba9b9e1ef89149c51114a8084ce;hpb=3d88bf660dae270c051c8319bba62c58a50c9d2b

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 5f6944fad..770fc6caa 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -13,9 +13,14 @@ m4_ifdef(`TARGET_ARCH', `m4_define(`GETTY', `/sbin/agetty -8 38400')')m4_dnl
 m4_dnl
 [Unit]
 Description=Getty on %I
-Before=getty.target
-After=basic.target
-Conflicts=shutdown.target
+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
 
 [Service]
 Environment=TERM=linux
@@ -24,10 +29,9 @@ 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
-Alias=getty.target.wants/getty@tty2.service
-Alias=getty.target.wants/getty@tty3.service
-Alias=getty.target.wants/getty@tty4.service
-Alias=getty.target.wants/getty@tty5.service
-Alias=getty.target.wants/getty@tty6.service
+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