summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2013-05-16 12:59:47 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-29 22:07:52 +0100
commit0116e82631a0267be3e5b7c04007980cb4e10171 (patch)
tree9fcbce6ff46ba1bad0b24aa523c3b1be4e37af21 /meta/recipes-core
parent676fd3f394a0c0576b63c77ed2184bf5f42c29b6 (diff)
downloadpoky-0116e82631a0267be3e5b7c04007980cb4e10171.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 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>
Diffstat (limited to 'meta/recipes-core')
-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 @@
2Description=Machine ID first boot configure 2Description=Machine ID first boot configure
3DefaultDependencies=no 3DefaultDependencies=no
4ConditionPathExists=|!/etc/machine-id 4ConditionPathExists=|!/etc/machine-id
5After=remount-rootfs.service 5After=systemd-remount-fs.service
6Before=sysinit.target 6Before=sysinit.target
7 7
8[Service] 8[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 @@
2Description=Run pending postinsts 2Description=Run pending postinsts
3DefaultDependencies=no 3DefaultDependencies=no
4ConditionPathExists=|/etc/rcS.d/S98run-postinsts 4ConditionPathExists=|/etc/rcS.d/S98run-postinsts
5After=remount-rootfs.service tmp.mount 5After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount
6Before=sysinit.target 6Before=sysinit.target
7 7
8[Service] 8[Service]