chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: fix operation precedence mix-up
[elogind.git]
/
units
/
getty@.service.m4
diff --git
a/units/getty@.service.m4
b/units/getty@.service.m4
index 14d8187269a80233630a6d31ef75d5720c2a177f..fcf1de197fb94383e7b5b9cf8e2bbdf995f75037 100644
(file)
--- a/
units/getty@.service.m4
+++ b/
units/getty@.service.m4
@@
-1,14
+1,14
@@
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# under the terms of the GNU
Lesser
General Public License as published by
+# the Free Software Foundation; either version 2
.1
of the License, or
# (at your option) any later version.
[Unit]
Description=Getty on %I
# (at your option) any later version.
[Unit]
Description=Getty on %I
-BindTo=dev-%i.device
-After=
dev-%i.device
systemd-user-sessions.service plymouth-quit-wait.service
+Documentation=man:agetty(8)
+After=systemd-user-sessions.service plymouth-quit-wait.service
m4_ifdef(`TARGET_FEDORA',
After=rc-local.service
)m4_dnl
m4_ifdef(`TARGET_FEDORA',
After=rc-local.service
)m4_dnl
@@
-24,15
+24,26
@@
After=rc-local.service
m4_ifdef(`TARGET_MANDRIVA',
After=rc-local.service
)m4_dnl
m4_ifdef(`TARGET_MANDRIVA',
After=rc-local.service
)m4_dnl
+m4_ifdef(`TARGET_MAGEIA',
+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
# 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
+IgnoreOnIsolate=yes
+
+# On systems without virtual consoles, don't start any getty. (Note
+# that serial gettys are covered by serial-getty@.service, not this
+# unit
+ConditionPathExists=/dev/tty0
[Service]
Environment=TERM=linux
[Service]
Environment=TERM=linux
-ExecStart=-/sbin/agetty %I 38400
+# the VT is cleared by TTYVTDisallocate
+ExecStart=-/sbin/agetty --noclear %I 38400
+Type=idle
Restart=always
RestartSec=0
UtmpIdentifier=%I
Restart=always
RestartSec=0
UtmpIdentifier=%I
@@
-41,6
+52,7
@@
TTYReset=yes
TTYVHangup=yes
TTYVTDisallocate=yes
KillMode=process
TTYVHangup=yes
TTYVTDisallocate=yes
KillMode=process
+IgnoreSIGPIPE=no
# Unset locale for the console getty since the console has problems
# displaying some internationalized messages.
# Unset locale for the console getty since the console has problems
# displaying some internationalized messages.