diff options
author | Jonathan Liu <net147@gmail.com> | 2013-05-16 12:59:47 +1000 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-05-31 16:03:36 +0100 |
commit | ad527115ad122df957e204d4af57edf600f9d419 (patch) | |
tree | 042385aa310963b95f401829f61bafa9c723cce6 | |
parent | 1819b7d5915d85a0c2a4780ea4b70923c54fc252 (diff) | |
download | openembedded-core-ad527115ad122df957e204d4af57edf600f9d419.tar.gz |
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 master rev: 8b59ec4eb761d88445da94bb90aa2c5db0bbf365)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/systemd/systemd-compat-units/machineid.service | 2 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service | 2 |
2 files changed, 2 insertions, 2 deletions
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] |