summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-05-16 12:59:47 +1000
committerSaul Wold <sgw@linux.intel.com>2013-05-29 08:19:03 +0900
commit8b59ec4eb761d88445da94bb90aa2c5db0bbf365 (patch)
tree954d7a379df4d2c48d83fdafa2878d46351db423 /meta
parent8f5bc47729edb8cb051d81e9ff1680cb8d2eca25 (diff)
downloadopenembedded-core-8b59ec4eb761d88445da94bb90aa2c5db0bbf365.tar.gz
openembedded-core-8b59ec4eb761d88445da94bb90aa2c5db0bbf365.tar.bz2
openembedded-core-8b59ec4eb761d88445da94bb90aa2c5db0bbf365.zip
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] Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/systemd/systemd-compat-units/machineid.service2
-rw-r--r--meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service2
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]