diff options
author | Bruno Bottazzini <bruno.bottazzini@intel.com> | 2015-05-11 15:02:50 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-28 09:44:08 +0100 |
commit | 8fc71f42478afeb414dc09c4ffe43b2ddd07a276 (patch) | |
tree | 6d7b0bf2944c684cd09e1926d477038b0e2201d6 /meta | |
parent | 10ee6be5b863b1d7d808680f52874843e5b43ea0 (diff) | |
download | poky-8fc71f42478afeb414dc09c4ffe43b2ddd07a276.tar.gz |
systemd: removing workaround odering journal after remote-fs.target
This workaround is not needed in version 219 since the fix is upstreamed with:
919699ec301ea507edce4a619141ed22e789ac0d
(From OE-Core rev: e3330d0602fb3ad347f028063d25f634a36ea344)
(From OE-Core rev: fdcbbb50a9946733bd204b8db45606c929e43822)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/systemd/systemd_219.bb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index c196017e1e..6ed4fe0995 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb | |||
@@ -175,9 +175,6 @@ do_install() { | |||
175 | 175 | ||
176 | # Enable journal to forward message to syslog daemon | 176 | # Enable journal to forward message to syslog daemon |
177 | sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf | 177 | sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf |
178 | # its needed in 216 upstream has fixed it with 919699ec301ea507edce4a619141ed22e789ac0d | ||
179 | # don't order journal flushing afte remote-fs.target | ||
180 | sed -i -e 's/ remote-fs.target$//' ${D}${systemd_unitdir}/system/systemd-journal-flush.service | ||
181 | # this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it | 178 | # this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it |
182 | # for existence else it fails | 179 | # for existence else it fails |
183 | if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then | 180 | if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then |