summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorJonathan Lebon <jonathan@jlebon.com>2019-03-12 15:23:25 -0400
committerLennart Poettering <lennart@poettering.net>2019-03-14 11:28:19 +0100
commit8e729d511eb9cb53e30d3a32e648376c7cfe0318 (patch)
treebb8f10e75c21284c3e23a16d4d7ed1ddfc1b7049 /units
parent7b7426506ad317f454f3f16d5b9fdf11b7ac287a (diff)
downloadsystemd-8e729d511eb9cb53e30d3a32e648376c7cfe0318.tar.gz
units: update catalog after systemd-tmpfiles runs
`systemd-journal-catalog-update.service` writes to `/var`. However, it's not explicitly ordered wrt `systemd-tmpfiles-setup.service`, which means that it may run before or after. This is an issue for Fedora CoreOS, which uses Ignition. We want to be able to prepare `/var` on first boot from the initrd, where the SELinux policy is not loaded yet. This means that the hierarchy under `/var` is not correctly labeled. We add a `Z /var - - -` tmpfiles entry so that it gets relabeled once `/var` gets mounted post-switchroot. So any service that tries to access `/var` before `systemd-tmpfiles` relabels it is likely to hit `EACCES`. Fix this by simply ordering `systemd-journal-catalog-update.service` after `systemd-tmpfiles-setup.service`. This is also clearer since the tmpfiles entries are the canonical source of how `/var` should be populated. For more context on this, see: https://github.com/coreos/ignition/issues/635#issuecomment-446620297
Diffstat (limited to 'units')
-rw-r--r--units/systemd-journal-catalog-update.service.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/units/systemd-journal-catalog-update.service.in b/units/systemd-journal-catalog-update.service.in
index 6a7bf006cd..18b2739ffa 100644
--- a/units/systemd-journal-catalog-update.service.in
+++ b/units/systemd-journal-catalog-update.service.in
@@ -12,7 +12,7 @@ Description=Rebuild Journal Catalog
Documentation=man:systemd-journald.service(8) man:journald.conf(5)
DefaultDependencies=no
Conflicts=shutdown.target
-After=local-fs.target
+After=local-fs.target systemd-tmpfiles-setup.service
Before=sysinit.target shutdown.target systemd-update-done.service
ConditionNeedsUpdate=/var