From 0116e82631a0267be3e5b7c04007980cb4e10171 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 16 May 2013 12:59:47 +1000 Subject: systemd: fix ordering for machineid and run-postinsts services The remount-rootfs.service unit has been renamed to systemd-remount-fs.service in systemd v183 and later. The run-postinsts script writes to /var/log (a symbolic link to /var/volatile/log), so systemd-tmpfiles-setup.service is added to After= in run-postinsts.service to ensure /var/volatile/log is created before running the script. [YOCTO #4490] (From OE-Core rev: 8b59ec4eb761d88445da94bb90aa2c5db0bbf365) Signed-off-by: Jonathan Liu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd-compat-units/machineid.service | 2 +- meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/systemd') diff --git a/meta/recipes-core/systemd/systemd-compat-units/machineid.service b/meta/recipes-core/systemd/systemd-compat-units/machineid.service index cab8f76ab8..f586c6d60f 100644 --- a/meta/recipes-core/systemd/systemd-compat-units/machineid.service +++ b/meta/recipes-core/systemd/systemd-compat-units/machineid.service @@ -2,7 +2,7 @@ Description=Machine ID first boot configure DefaultDependencies=no ConditionPathExists=|!/etc/machine-id -After=remount-rootfs.service +After=systemd-remount-fs.service Before=sysinit.target [Service] diff --git a/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service b/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service index da6fe76a38..02c1d86821 100644 --- a/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service +++ b/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service @@ -2,7 +2,7 @@ Description=Run pending postinsts DefaultDependencies=no ConditionPathExists=|/etc/rcS.d/S98run-postinsts -After=remount-rootfs.service tmp.mount +After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount Before=sysinit.target [Service] -- cgit v1.2.3-54-g00ecf