units: so far we defaulted to 90s as default timeout for most things, let's do so...

[elogind.git] / units / systemd-journal-flush.service.in

diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in
index 503e8a63b812b5da8f1bebb0a08092f49b185f24..a0a2e3fdb4150c1b23ddfe9d98dfd78061e73d42 100644 (file)
--- a/units/systemd-journal-flush.service.in
+++ b/units/systemd-journal-flush.service.in
@@ -6,13 +6,17 @@
 #  (at your option) any later version.
 
 [Unit]
 #  (at your option) any later version.
 
 [Unit]

-Description=Trigger Flushing of Journal to Persistent Storage
+Description=Flush Journal to Persistent Storage

 Documentation=man:systemd-journald.service(8) man:journald.conf(5)
 DefaultDependencies=no
 Requires=systemd-journald.service
 Documentation=man:systemd-journald.service(8) man:journald.conf(5)
 DefaultDependencies=no
 Requires=systemd-journald.service

-After=systemd-journald.service local-fs.target remote-fs.target
-Before=systemd-user-sessions.service
+After=systemd-journald.service
+After=systemd-remount-fs.service
+Before=systemd-user-sessions.service systemd-tmpfiles-setup.service
+RequiresMountsFor=/var/log/journal

 
 [Service]
 
 [Service]

-ExecStart=@rootbindir@/systemctl kill --kill-who=main --signal=SIGUSR1 systemd-journald.service
+ExecStart=@rootbindir@/journalctl --flush

 Type=oneshot
 Type=oneshot

+RemainAfterExit=yes
+TimeoutSec=90s