diff options
| author | Jonathan Lebon <jonathan@jlebon.com> | 2019-09-24 17:08:54 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2019-09-24 21:39:10 +0000 |
| commit | 88182635ab7dbaf20e72e7a7bf3d4bdf68fae763 (patch) | |
| tree | 1ebe1f684420e479bbb6ca86a364b059135e5cc1 /src/boot/ostree-finalize-staged.service | |
| parent | 94fcba96e08511f782642dad156150f0df063250 (diff) | |
| download | ostree-88182635ab7dbaf20e72e7a7bf3d4bdf68fae763.tar.gz | |
boot/finalize-staged: Run after systemd-journal-flush.service
In Fedora 31, `systemd-journal-flush.service` uses a new
`--smart-relinquish-var` switch which fixes the
`umount: /var: target is busy` bug by telling journald to stop logging
to `/var` and back to `/run` again during shutdown.
This interacted with `ostree-finalize-staged.service` in a tricky way:
since we weren't strongly ordered against it, when we happened to
finalize after `/var` is relinquished, we never persisted the output
from that service to disk. This then threw off `rpm-ostree status` when
trying to find the completion message to know that finalization went
well.
Just fix this by adding an explicit `After=` on that unit. That way we
shut down *before* `systemd-journal-flush.service` (the `/var`
relinquish bit happens in its `ExecStop=`).
For more info, see:
https://github.com/systemd/systemd/commit/3ff7a50d66e3f851d3d9f132b740a7fb2055aa1d
https://github.com/systemd/systemd/commit/1e187d2dd52cbb4f0bb30e4d96acf7f72a145b91
https://bugzilla.redhat.com/show_bug.cgi?id=1751272
Closes: #1926
Approved by: cgwalters
Diffstat (limited to 'src/boot/ostree-finalize-staged.service')
| -rw-r--r-- | src/boot/ostree-finalize-staged.service | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/boot/ostree-finalize-staged.service b/src/boot/ostree-finalize-staged.service index e112bc0c..9c4706e8 100644 --- a/src/boot/ostree-finalize-staged.service +++ b/src/boot/ostree-finalize-staged.service @@ -26,6 +26,9 @@ DefaultDependencies=no RequiresMountsFor=/sysroot After=local-fs.target Before=basic.target final.target +# We want to make sure the transaction logs are persisted to disk: +# https://bugzilla.redhat.com/show_bug.cgi?id=1751272 +After=systemd-journal-flush.service Conflicts=final.target [Service] |