aboutsummaryrefslogtreecommitdiffstats
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 5dd9e823db4..c3106722f66 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"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r2"
+PR = "r3"
SERIAL_CONSOLE ?= "115200 ttyS0"
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 daf0dac723f..8eeaab697c3 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
[Service]
Environment=TERM=vt100
-ExecStart=-/sbin/getty @BAUDRATE@ %I
+ExecStart=-/sbin/agetty -s %I @BAUDRATE@
Restart=always
RestartSec=0
UtmpIdentifier=%I
+TTYPath=/dev/%I
+TTYReset=yes
+TTYVHangup=yes
KillMode=process
+IgnoreSIGPIPE=no
# Some login implementations ignore SIGTERM, so we send SIGHUP
# instead, to ensure that login terminates cleanly.