diff options
author | Geoff Parker <geoffhp@gmail.com> | 2020-09-11 20:07:05 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-22 23:34:40 +0100 |
commit | 99d2fe86386096504ca82853dd54757729f9b3d8 (patch) | |
tree | c85693f2649c8be1bbe869dded54abe96632728d | |
parent | 2cc334afbf2eebe838e6ba71d4cdfbe03a88829c (diff) | |
download | poky-99d2fe86386096504ca82853dd54757729f9b3d8.tar.gz |
systemd-serialgetty: Replace sed quoting using ' with " to allow var expansion
A recent commit added single quotes around the sed regex's. This prevented the
expansion of $default_baudrate in do_install(), and ended up with systemd's'
serial-getty@.service file having a literal $default_baudrate.
This broke the serial console getty service.
serial-getty@.service was getting a line which looked like this:
ExecStart=-/sbin/agetty -8 -L %I $default_baudrate $TERM
Rather than:
ExecStart=-/sbin/agetty -8 -L %I 115200 $TERM
Fixed by repacing the single quotes with double quotes in the sed expressions.
(From OE-Core rev: 1cc94a6b9b6a9d12f782471053448ad9795944bb)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 80b721bfa4fe300a2f52f233f44fa2835426d304)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/systemd/systemd-serialgetty.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd-serialgetty.bb b/meta/recipes-core/systemd/systemd-serialgetty.bb index 059fccc2b6..0cc0dc8c79 100644 --- a/meta/recipes-core/systemd/systemd-serialgetty.bb +++ b/meta/recipes-core/systemd/systemd-serialgetty.bb | |||
@@ -21,7 +21,7 @@ do_install() { | |||
21 | install -d ${D}${systemd_unitdir}/system/ | 21 | install -d ${D}${systemd_unitdir}/system/ |
22 | install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/ | 22 | install -d ${D}${sysconfdir}/systemd/system/getty.target.wants/ |
23 | install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_unitdir}/system/ | 23 | install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_unitdir}/system/ |
24 | sed -i -e 's/\@BAUDRATE\@/$default_baudrate/g' ${D}${systemd_unitdir}/system/serial-getty@.service | 24 | sed -i -e "s/\@BAUDRATE\@/$default_baudrate/g" ${D}${systemd_unitdir}/system/serial-getty@.service |
25 | 25 | ||
26 | tmp="${SERIAL_CONSOLES}" | 26 | tmp="${SERIAL_CONSOLES}" |
27 | for entry in $tmp ; do | 27 | for entry in $tmp ; do |
@@ -34,7 +34,7 @@ do_install() { | |||
34 | else | 34 | else |
35 | # install custom service file for the non-default baudrate | 35 | # install custom service file for the non-default baudrate |
36 | install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_unitdir}/system/serial-getty$baudrate@.service | 36 | install -m 0644 ${WORKDIR}/serial-getty@.service ${D}${systemd_unitdir}/system/serial-getty$baudrate@.service |
37 | sed -i -e s/\@BAUDRATE\@/$baudrate/g ${D}${systemd_unitdir}/system/serial-getty$baudrate@.service | 37 | sed -i -e "s/\@BAUDRATE\@/$baudrate/g" ${D}${systemd_unitdir}/system/serial-getty$baudrate@.service |
38 | # enable the service | 38 | # enable the service |
39 | ln -sf ${systemd_unitdir}/system/serial-getty$baudrate@.service \ | 39 | ln -sf ${systemd_unitdir}/system/serial-getty$baudrate@.service \ |
40 | ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty$baudrate@$ttydev.service | 40 | ${D}${sysconfdir}/systemd/system/getty.target.wants/serial-getty$baudrate@$ttydev.service |