43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
From 0ad235ddb0640251e6be5a7250ee2b9236571521 Mon Sep 17 00:00:00 2001
|
|
From: Umut Tezduyar Lindskog <umut.tezduyar@axis.com>
|
|
Date: Wed, 29 Oct 2014 11:20:02 +0100
|
|
Subject: [PATCH] man: explain journalctl --flush correctly
|
|
|
|
(cherry picked from commit 2a97b03b3b087e724867e7501ae0c1535ee35031)
|
|
---
|
|
NEWS | 4 ++++
|
|
man/journalctl.xml | 4 ++--
|
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/NEWS b/NEWS
|
|
index 82a1948a38..d8770a0fcf 100644
|
|
--- a/NEWS
|
|
+++ b/NEWS
|
|
@@ -7,6 +7,10 @@ CHANGES WITH 217:
|
|
show log timestamps in the UTC timezone. journalctl now also
|
|
accepts -n/--lines=all to disable line capping in a pager.
|
|
|
|
+ * journalctl gained a new switch, --flush, that flushes
|
|
+ logs from /run/log/journal to /var/log/journal if
|
|
+ persistent storage is enabled.
|
|
+
|
|
* Services can notify the manager before they start a reload
|
|
(by sending RELOADING=1) or shutdown (by sending
|
|
STOPPING=1). This allows the manager to track and show the
|
|
diff --git a/man/journalctl.xml b/man/journalctl.xml
|
|
index db2a1e142b..0ed3ca3bc8 100644
|
|
--- a/man/journalctl.xml
|
|
+++ b/man/journalctl.xml
|
|
@@ -883,9 +883,9 @@
|
|
|
|
<listitem><para>Asks the Journal
|
|
daemon to flush any log data stored in
|
|
- <filename>/run/systemd/log</filename>
|
|
+ <filename>/run/log/journal</filename>
|
|
into
|
|
- <filename>/var/systemd/log</filename>,
|
|
+ <filename>/var/log/journal</filename>,
|
|
if persistent storage is enabled. This
|
|
call does not return until the
|
|
operation is
|