diff --git a/Makefile.am b/Makefile.am
index 8e6e3fcbca..f6301f1283 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -504,7 +504,8 @@ MANPAGES = \
man/sd_journal_open.3 \
man/sd_journal_next.3 \
man/sd_journal_get_data.3 \
- man/sd_journal_get_realtime_usec.3
+ man/sd_journal_get_realtime_usec.3 \
+ man/sd_journal_get_cutoff_realtime_usec.3
MANPAGES_ALIAS = \
man/reboot.8 \
@@ -555,7 +556,8 @@ MANPAGES_ALIAS = \
man/sd_journal_enumerate_data.3 \
man/sd_journal_restart_data.3 \
man/SD_JOURNAL_FOREACH_DATA.3 \
- man/sd_journal_get_monotonic_usec.3
+ man/sd_journal_get_monotonic_usec.3 \
+ man/sd_journal_get_cutoff_monotonic_usec.3
man/reboot.8: man/halt.8
man/poweroff.8: man/halt.8
@@ -606,6 +608,7 @@ man/sd_journal_enumerate_data.3: man/sd_journal_get_data.3
man/sd_journal_restart_data.3: man/sd_journal_get_data.3
man/SD_JOURNAL_FOREACH_DATA.3: man/sd_journal_get_data.3
man/sd_journal_get_monotonic_usec.3: man/sd_journal_get_realtime_usec.3
+man/sd_journal_get_cutoff_monotonic_usec.3: man/sd_journal_get_cutoff_realtime_usec.3
XML_FILES = \
${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
diff --git a/TODO b/TODO
index c0a553bf82..333db58fd4 100644
--- a/TODO
+++ b/TODO
@@ -34,6 +34,8 @@ Bugfixes:
Features:
+* change mount access mode ot 0700 or so for debugfs?
+
* logind: wakelock/opportunistic suspend support
* seccomp filters for services
diff --git a/man/sd_journal_get_cutoff_realtime_usec.xml b/man/sd_journal_get_cutoff_realtime_usec.xml
new file mode 100644
index 0000000000..c60e8f43ad
--- /dev/null
+++ b/man/sd_journal_get_cutoff_realtime_usec.xml
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+ sd_journal_get_cutoff_realtime_usec
+ systemd
+
+
+
+ Developer
+ Lennart
+ Poettering
+ lennart@poettering.net
+
+
+
+
+
+ sd_journal_get_cutoff_realtime_usec
+ 3
+
+
+
+ sd_journal_get_cutoff_realtime_usec
+ sd_journal_get_cutoff_monotonic_usec
+ Read timestamps from the current journal entry
+
+
+
+
+ #include <systemd/sd-journal.h>
+
+
+ int sd_journal_get_cutoff_realtime_usec
+ sd_journal* j
+ uint64_t* from
+ uint64_t* to
+
+
+
+ int sd_journal_get_cutoff_monotonic_usec
+ sd_journal* j
+ sd_id128_t boot_id
+ uint64_t* from
+ uint64_t* to
+
+
+
+
+
+
+ Description
+
+ sd_journal_get_cutoff_realtime_usec()
+ gets the realtime (wallclock) timestamps of the first
+ and last entries accessible in the journal. It takes
+ three arguments: the journal context object and two
+ pointers to 64 Bit unsigned integers to store the
+ timestamps in. The timestamps are in microseconds
+ since the epoch, i.e. CLOCK_REALTIME. Either one of
+ the two timestamp arguments may be passed as NULL in
+ case the timestamp is not needed, but not both.
+
+ sd_journal_get_cutoff_monotonic_usec()
+ gets the monotonic timestamps of the first and last
+ entries accessible in the journal. It takes three
+ arguments: the journal context object, a 128 Bit
+ identifier for the boot, and two pointers to 64 Bit
+ unsigned integers to store the timestamps. The
+ timestamps are in microseconds since boot-up of the
+ specific boot, i.e. CLOCK_MONOTONIC. Since the
+ monotonic clock begins new with every reboot it only
+ defines a well-defined point in time when used
+ together with an identifier identifying the boot, see
+ sd_id128_get_boot3
+ for more information. The function will return the
+ timestamps for the boot identified by the passed boot
+ ID. Either one of the two timestamp arguments may be
+ passed as NULL in case the timestamp is not needed,
+ but not both.
+
+
+
+ Return Value
+
+ sd_journal_get_cutoff_realtime_usec()
+ and
+ sd_journal_get_cutoff_monotonic_usec()
+ return 1 on success, 0 if not suitable entries are in
+ the journal or a negative errno-style error code.
+
+
+
+ Notes
+
+ The
+ sd_journal_get_cutoff_realtime_usec()
+ and
+ sd_journal_get_cutoff_monotonic_usec()
+ interfaces are available as shared library, which can
+ be compiled and linked to with the
+ libsystemd-journal
+ pkg-config1
+ file.
+
+
+
+ See Also
+
+
+ systemd1,
+ sd-journal3,
+ sd_journal_open3,
+ sd_journal_get_realtime_usec3,
+ sd_id128_get_boot3,
+ clock_gettime2
+
+
+
+
diff --git a/man/sd_journal_get_realtime_usec.xml b/man/sd_journal_get_realtime_usec.xml
index bebf4f5a3c..a8aa3a4772 100644
--- a/man/sd_journal_get_realtime_usec.xml
+++ b/man/sd_journal_get_realtime_usec.xml
@@ -72,15 +72,15 @@
Description
sd_journal_get_realtime_usec()
- gets the realtime (wallclock) timestamp of the the
+ gets the realtime (wallclock) timestamp of the
current journal entry. It takes two arguments: the
journal context object and a pointer to a 64 Bit
unsigned integer to store the timestamp in. The
timestamp is in microseconds since the epoch,
i.e. CLOCK_REALTIME.
- sd_journal_get_realtime_usec()
- gets the monotonic timestamp of the the current
+ sd_journal_get_monotonic_usec()
+ gets the monotonic timestamp of the current
journal entry. It takes three arguments: the journal
context object, a pointer to a 64 Bit unsigned integer
to store the timestamp in as well as a 128 Bit ID
@@ -89,7 +89,7 @@
the specific boot, i.e. CLOCK_MONOTONIC. Since the
monotonic clock begins new with every reboot it only
defines a well-defined point in time when used
- together with a identifier identifying the boot, see
+ together with an identifier identifying the boot, see
sd_id128_get_boot3
for more information. If the boot ID parameter is
passed NULL the function will fail if the monotonic
@@ -138,7 +138,8 @@
sd_journal_next3,
sd_journal_get_data3,
sd_id128_get_boot3,
- clock_gettime2
+ clock_gettime2,
+ sd_journal_get_cutoff_realtime_usec3
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index e1119224e2..426a9d617c 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -639,7 +639,7 @@ int show_journal_by_unit(
if (r < 0)
goto finish;
- if (not_before < cutoff)
+ if (r > 0 && not_before < cutoff)
printf("Warning: Journal has been rotated since unit was started. Log output is incomplete or unavailable.\n");
warn_cutoff = false;