X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Fgetty%40.service.m4;h=98c6a88213a1fc84fe6ba722cd8336cc914b0037;hb=cbe1bded5fb719faf374bf63d36a80c6d13d2b19;hp=d0084233a9ab66bbb74a55ff65d15329229d5f11;hpb=36adffeab07c74470bc96417b17a72b53055ee42;p=elogind.git

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index d0084233a..98c6a8821 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -8,26 +8,37 @@
 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_UBUNTU', `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
-Before=getty.target
+Requires=dev-%i.device
+After=dev-%i.device
 m4_ifdef(`TARGET_FEDORA',
 After=rc-local.service
-Before=prefdm.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
+
 [Service]
 Environment=TERM=linux
-ExecStart=GETTY %I
-Restart=restart-always
+ExecStart=-GETTY %I
+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