X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Fgetty%40.service.m4;h=1edcad9f0ed22ab9fc85de49f64ae7408d2cd064;hp=31e8415c0367d4c1c4bf4aed18ef96818531771f;hb=b81884e7466b8e8bc1261b1b1a722d11694b8c54;hpb=cfe243e3720062c2e0eecd8bb0bdd7b4059e156d

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 31e8415c0..1edcad9f0 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -8,16 +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
+BindTo=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 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=-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