|
 |
47313b1 |
From 309ce8c2537ae72e2c7a07b7e21bee5fd2da0960 Mon Sep 17 00:00:00 2001
|
|
|
b397f2a |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
b397f2a |
Date: Sat, 1 Nov 2014 13:52:14 -0400
|
|
|
b397f2a |
Subject: [PATCH] systemd-journal-flush.service: remove "trigger" from
|
|
|
b397f2a |
description
|
|
|
b397f2a |
|
|
|
b397f2a |
This service is now synchronous, so "trigger" is misleading.
|
|
|
b397f2a |
|
|
|
b397f2a |
(cherry picked from commit a65b82457735df2ef58736a55846f400124a8dc0)
|
|
|
b397f2a |
---
|
|
|
b397f2a |
NEWS | 7 ++++---
|
|
|
b397f2a |
units/systemd-journal-flush.service.in | 2 +-
|
|
|
b397f2a |
2 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
b397f2a |
|
|
|
b397f2a |
diff --git a/NEWS b/NEWS
|
|
|
b397f2a |
index afc73a781f..ac987ad5b7 100644
|
|
|
b397f2a |
--- a/NEWS
|
|
|
b397f2a |
+++ b/NEWS
|
|
|
b397f2a |
@@ -7,9 +7,10 @@ CHANGES WITH 217:
|
|
|
b397f2a |
show log timestamps in the UTC timezone. journalctl now also
|
|
|
b397f2a |
accepts -n/--lines=all to disable line capping in a pager.
|
|
|
b397f2a |
|
|
|
b397f2a |
- * journalctl gained a new switch, --flush, that flushes
|
|
|
b397f2a |
- logs from /run/log/journal to /var/log/journal if
|
|
|
b397f2a |
- persistent storage is enabled.
|
|
|
b397f2a |
+ * journalctl gained a new switch, --flush, that synchronously
|
|
|
b397f2a |
+ flushes logs from /run/log/journal to /var/log/journal if
|
|
|
b397f2a |
+ persistent storage is enabled. systemd-journal-flush.service
|
|
|
b397f2a |
+ now waits until the operation is complete.
|
|
|
b397f2a |
|
|
|
b397f2a |
* Services can notify the manager before they start a reload
|
|
|
b397f2a |
(by sending RELOADING=1) or shutdown (by sending
|
|
|
b397f2a |
diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in
|
|
|
b397f2a |
index 2612220e2e..fa290897d6 100644
|
|
|
b397f2a |
--- a/units/systemd-journal-flush.service.in
|
|
|
b397f2a |
+++ b/units/systemd-journal-flush.service.in
|
|
|
b397f2a |
@@ -6,7 +6,7 @@
|
|
|
b397f2a |
# (at your option) any later version.
|
|
|
b397f2a |
|
|
|
b397f2a |
[Unit]
|
|
|
b397f2a |
-Description=Trigger Flushing of Journal to Persistent Storage
|
|
|
b397f2a |
+Description=Flush Journal to Persistent Storage
|
|
|
b397f2a |
Documentation=man:systemd-journald.service(8) man:journald.conf(5)
|
|
|
b397f2a |
DefaultDependencies=no
|
|
|
b397f2a |
Requires=systemd-journald.service
|