From 9b60a175fc74dc65f2d9c4c4d8687d2303501dde Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 19 Jun 2020 00:02:55 -0700 Subject: systemd-serialgetty: do not use BindsTo This unit was changed from 'BindsTo' in the following commit. """ commit f0f359ec9210759f6b4dbfb35d3fba8af208c43a Author: Jason Wessel Date: Thu Aug 29 07:00:31 2019 -0700 serial-getty@.service: Allow device to fast fail if it does not exist """ It was changed back to 'BindTo' in the following commit. """ commit 63bbff61b78c651339c4b18d8376187379ec3b3c Author: Otavio Salvador Date: Fri Jun 12 14:30:44 2020 -0300 systemd: Sync systemd-serialgetty@.service with upstream """ This is now causing runtime problem for qemuarm64. The default.target is not reached until a timeout. Output is like below. """ root@qemuarm64:~# systemd-analyze Bootup is not yet finished (org.freedesktop.systemd1.Manager.FinishTimestampMonotonic=0). Please try again later. Hint: Use 'systemctl list-jobs' to see active jobs root@qemuarm64:~# systemctl list-jobs JOB UNIT TYPE STATE 102 getty.target start waiting 1 multi-user.target start waiting 95 systemd-update-utmp-runlevel.service start waiting 110 serial-getty@hvc0.service start waiting 111 dev-hvc0.device start running """ We can see that we are waiting for /dev/hvc0, while in fact there's no /dev/hvc0. Jason's commit actually solves such problem. So restore to use Jason's method. Do not use 'BindsTo'. (From OE-Core rev: b1d0eacc431517695c348ad14f4452be607c0b62) Signed-off-by: Chen Qi Signed-off-by: Richard Purdie (cherry picked from commit 43b989c1231d3d867303ccebceda72364a9519ee) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service b/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service index 542b905795..549d566009 100644 --- a/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service +++ b/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service @@ -11,7 +11,8 @@ Description=Serial Getty on %I Documentation=man:agetty(8) man:systemd-getty-generator(8) Documentation=http://0pointer.de/blog/projects/serial-console.html -BindsTo=dev-%i.device +PartOf=dev-%i.device +ConditionPathExists=/dev/%i After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service getty-pre.target After=rc-local.service -- cgit v1.2.3-54-g00ecf