diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-03-22 18:32:32 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-03-23 07:57:19 +0100 |
commit | 6b22bd198a87b5f113971d8fcd0e7211cd143c7d (patch) | |
tree | 51db7ebc51de392efc295cd923b426b591a08dac | |
parent | b020571752610ec4e46be7d1578b019a1f29be4e (diff) | |
download | meta-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.bb | 2 | ||||
-rw-r--r-- | meta-oe/recipes-core/systemd/systemd-serialgetty/serial-getty@.service | 6 |
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" | |||
2 | LICENSE = "GPLv2+" | 2 | LICENSE = "GPLv2+" |
3 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=751419260aa954499f7abaabaa882bbe" | 3 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=751419260aa954499f7abaabaa882bbe" |
4 | 4 | ||
5 | PR = "r2" | 5 | PR = "r3" |
6 | 6 | ||
7 | SERIAL_CONSOLE ?= "115200 ttyS0" | 7 | SERIAL_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] |
19 | Environment=TERM=vt100 | 19 | Environment=TERM=vt100 |
20 | ExecStart=-/sbin/getty @BAUDRATE@ %I | 20 | ExecStart=-/sbin/agetty -s %I @BAUDRATE@ |
21 | Restart=always | 21 | Restart=always |
22 | RestartSec=0 | 22 | RestartSec=0 |
23 | UtmpIdentifier=%I | 23 | UtmpIdentifier=%I |
24 | TTYPath=/dev/%I | ||
25 | TTYReset=yes | ||
26 | TTYVHangup=yes | ||
24 | KillMode=process | 27 | KillMode=process |
28 | IgnoreSIGPIPE=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. |