From: Yu Watanabe Date: Wed, 22 May 2024 15:03:42 +0000 (+0900) Subject: units: stop systemd-journald before systemd-soft-reboot.service X-Git-Tag: v256-rc3~7^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F32975%2Fhead;p=thirdparty%2Fsystemd.git units: stop systemd-journald before systemd-soft-reboot.service Typically, soft-reboot.target is never reached. So, without this change, systemd-journald may be killed by PID1 on soft-reboot, and may cause journal corruption. --- diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in index 2b340f4ea71..96362f5730a 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in @@ -17,7 +17,10 @@ Before=sysinit.target # To avoid journald SIGKILLed during soft-reboot and corrupting journals. # See https://github.com/systemd/systemd/issues/30195 -Before=soft-reboot.target +# Note, typically soft-reboot.target will be never reached, +# and systemd-soft-reboot.service will trigger soft-reboot. +# Hence, this must be stopped before systemd-soft-reboot.service. +Before=soft-reboot.target systemd-soft-reboot.service Conflicts=soft-reboot.target # Mount and swap units need the journal socket units. If they were removed by