summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-03-22 18:32:32 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2012-03-23 07:57:19 +0100
commit6b22bd198a87b5f113971d8fcd0e7211cd143c7d (patch)
tree51db7ebc51de392efc295cd923b426b591a08dac
parentb020571752610ec4e46be7d1578b019a1f29be4e (diff)
downloadmeta-openembedded-6b22bd198a87b5f113971d8fcd0e7211cd143c7d.tar.gz
systemd-serialgetty: sync with upstream
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--meta-oe/recipes-core/systemd/systemd-serialgetty.bb2
-rw-r--r--meta-oe/recipes-core/systemd/systemd-serialgetty/serial-getty@.service6
2 files changed, 6 insertions, 2 deletions
diff --git a/meta-oe/recipes-core/systemd/systemd-serialgetty.bb b/meta-oe/recipes-core/systemd/systemd-serialgetty.bb
index 5dd9e823d..c3106722f 100644
--- a/meta-oe/recipes-core/systemd/systemd-serialgetty.bb
+++ b/meta-oe/recipes-core/systemd/systemd-serialgetty.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Systemd serial config"
2LICENSE = "GPLv2+" 2LICENSE = "GPLv2+"
3LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=751419260aa954499f7abaabaa882bbe" 3LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=751419260aa954499f7abaabaa882bbe"
4 4
5PR = "r2" 5PR = "r3"
6 6
7SERIAL_CONSOLE ?= "115200 ttyS0" 7SERIAL_CONSOLE ?= "115200 ttyS0"
8 8
diff --git a/meta-oe/recipes-core/systemd/systemd-serialgetty/serial-getty@.service b/meta-oe/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
index daf0dac72..8eeaab697 100644
--- a/meta-oe/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
+++ b/meta-oe/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
@@ -17,11 +17,15 @@ Before=getty.target
17 17
18[Service] 18[Service]
19Environment=TERM=vt100 19Environment=TERM=vt100
20ExecStart=-/sbin/getty @BAUDRATE@ %I 20ExecStart=-/sbin/agetty -s %I @BAUDRATE@
21Restart=always 21Restart=always
22RestartSec=0 22RestartSec=0
23UtmpIdentifier=%I 23UtmpIdentifier=%I
24TTYPath=/dev/%I
25TTYReset=yes
26TTYVHangup=yes
24KillMode=process 27KillMode=process
28IgnoreSIGPIPE=no
25 29
26# Some login implementations ignore SIGTERM, so we send SIGHUP 30# Some login implementations ignore SIGTERM, so we send SIGHUP
27# instead, to ensure that login terminates cleanly. 31# instead, to ensure that login terminates cleanly.