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=1a8a6a0e9cf6f70af6fb5683d26959c3b03f689e;hp=98c6a88213a1fc84fe6ba722cd8336cc914b0037;hb=1ead1cad4b63a5dc586ae5a630d3f2857d3a86a2;hpb=858dae181bb5461201ac1c04732d3ef4c67a0256 diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 index 98c6a8821..1a8a6a0e9 100644 --- a/units/getty@.service.m4 +++ b/units/getty@.service.m4 @@ -5,23 +5,25 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -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 -Requires=dev-%i.device -After=dev-%i.device +BindTo=dev-%i.device +After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service m4_ifdef(`TARGET_FEDORA', After=rc-local.service )m4_dnl m4_ifdef(`TARGET_ARCH', After=rc-local.service )m4_dnl +m4_ifdef(`TARGET_FRUGALWARE', +After=local.service +)m4_dnl +m4_ifdef(`TARGET_ALTLINUX', +After=rc-local.service +)m4_dnl +m4_ifdef(`TARGET_MANDRIVA', +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 @@ -30,12 +32,16 @@ Before=getty.target [Service] Environment=TERM=linux -ExecStart=-GETTY %I +ExecStart=-/sbin/agetty %I 38400 Restart=always RestartSec=0 UtmpIdentifier=%I KillMode=process-group +# Unset locale for the console getty since the console has problems +# displaying some internationalized messages. +Environment=LANG= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION= + # Some login implementations ignore SIGTERM, so we send SIGHUP # instead, to ensure that login terminates cleanly. KillSignal=SIGHUP