From b91ae210e62d7630346a9b5545dedc55c7831d95 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 24 Jul 2020 12:19:08 +0200 Subject: [PATCH] journal: adjust line about when the journal begins and ends This comes up occasionally with new users. The phrase "Logs begin ..." is ambiguous because it can be taken to mean the logs being displayed or all logs (the intended meaning). Let's rephrase this as "Journal begins ..." to make this clearer. --- man/journalctl.xml | 2 +- man/systemd-run.xml | 4 ++-- src/journal/journalctl.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/man/journalctl.xml b/man/journalctl.xml index 07310d90a1a..e562935eead 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -453,7 +453,7 @@ Suppresses all informational messages - (i.e. "-- Logs begin at …", "-- Reboot --"), + (i.e. "-- Journal begins at …", "-- Reboot --"), any warning messages regarding inaccessible system journals when run as a normal user. diff --git a/man/systemd-run.xml b/man/systemd-run.xml index a88f60fbb60..c1471e108f2 100644 --- a/man/systemd-run.xml +++ b/man/systemd-run.xml @@ -463,11 +463,11 @@ Mon Dec 8 20:44:24 KST 2014 Running as unit: run-71.timer Will run service as unit: run-71.service # journalctl -b -u run-71.timer --- Logs begin at Fri 2014-12-05 19:09:21 KST, end at Mon 2014-12-08 20:44:54 KST. -- +-- Journal begins at Fri 2014-12-05 19:09:21 KST, ends at Mon 2014-12-08 20:44:54 KST. -- Dec 08 20:44:38 container systemd[1]: Starting /bin/touch /tmp/foo. Dec 08 20:44:38 container systemd[1]: Started /bin/touch /tmp/foo. # journalctl -b -u run-71.service --- Logs begin at Fri 2014-12-05 19:09:21 KST, end at Mon 2014-12-08 20:44:54 KST. -- +-- Journal begins at Fri 2014-12-05 19:09:21 KST, ends at Mon 2014-12-08 20:44:54 KST. -- Dec 08 20:44:48 container systemd[1]: Starting /bin/touch /tmp/foo... Dec 08 20:44:48 container systemd[1]: Started /bin/touch /tmp/foo. diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 8d4897b942f..7613cb0b534 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -2562,10 +2562,10 @@ int main(int argc, char *argv[]) { if (r > 0) { if (arg_follow) - printf("-- Logs begin at %s. --\n", + printf("-- Journal begins at %s. --\n", format_timestamp_maybe_utc(start_buf, sizeof(start_buf), start)); else - printf("-- Logs begin at %s, end at %s. --\n", + printf("-- Journal begins at %s, ends at %s. --\n", format_timestamp_maybe_utc(start_buf, sizeof(start_buf), start), format_timestamp_maybe_utc(end_buf, sizeof(end_buf), end)); } -- 2.47.3