shutdownd: kill /etc/nologin file before we go down

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

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 5f6944fadbe8dc8c0031889d8fc5b1a426dfa38c..770fc6caac588385c4a9e7809b81d9696645a567 100644 (file)
--- 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