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=46164ab9d809ee848bc92c82a708ccffc262ec74;hp=b5875ce491a696153280caceee622f78a1222694;hb=d12b8cad40aa78fc948362340204c3fde778082d;hpb=9c2cd81e0ef9cf45adc6108eaea172d722f39321 diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 index b5875ce49..46164ab9d 100644 --- a/units/getty@.service.m4 +++ b/units/getty@.service.m4 @@ -7,27 +7,10 @@ [Unit] Description=Getty on %I -Documentation=man:agetty(8) +Documentation=man:agetty(8) man:systemd-getty-generator(8) +Documentation=http://0pointer.de/blog/projects/serial-console.html After=systemd-user-sessions.service plymouth-quit-wait.service -m4_ifdef(`TARGET_FEDORA', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_DEBIAN', -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 -m4_ifdef(`TARGET_MAGEIA', +m4_ifdef(`HAVE_SYSV_COMPAT', After=rc-local.service )m4_dnl @@ -37,15 +20,14 @@ After=rc-local.service Before=getty.target IgnoreOnIsolate=yes -# On systems without virtual consoles, don't start any getty. (Note +# On systems without virtual consoles, don't start any getty. Note # that serial gettys are covered by serial-getty@.service, not this -# unit +# unit. ConditionPathExists=/dev/tty0 [Service] -Environment=TERM=linux # the VT is cleared by TTYVTDisallocate -ExecStart=-/sbin/agetty --noclear %I 38400 +ExecStart=-/sbin/agetty --noclear %I $TERM Type=idle Restart=always RestartSec=0 @@ -56,14 +38,12 @@ TTYVHangup=yes TTYVTDisallocate=yes KillMode=process IgnoreSIGPIPE=no +SendSIGHUP=yes # Unset locale for the console getty since the console has problems # displaying some internationalized messages. Environment=LANG= LANGUAGE= 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 - [Install] -Alias=getty.target.wants/getty@tty1.service +WantedBy=getty.target +DefaultInstance=tty1