X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Fgetty%40.service.m4;h=98c6a88213a1fc84fe6ba722cd8336cc914b0037;hb=e0e1580aae5913870933518f3cb7055730ce3a49;hp=e023a9dcb74af931ca5143ab8c5d5c27d3bfe9b7;hpb=30609d9c187331640125d6b7e3c650330304b383;p=elogind.git

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index e023a9dcb..98c6a8821 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -8,12 +8,14 @@
 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
 )m4_dnl
@@ -21,11 +23,17 @@ 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