From 639a6a2529dd5a3109b998ccb44fb75b97525e13 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 13 Jul 2012 22:39:02 +0200 Subject: man: document sd_journal_seek_head() --- man/sd_journal_seek_head.xml | 173 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) create mode 100644 man/sd_journal_seek_head.xml (limited to 'man/sd_journal_seek_head.xml') diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml new file mode 100644 index 0000000000..b6a9a731c1 --- /dev/null +++ b/man/sd_journal_seek_head.xml @@ -0,0 +1,173 @@ + + + + + + + + + sd_journal_seek_head + systemd + + + + Developer + Lennart + Poettering + lennart@poettering.net + + + + + + sd_journal_seek_head + 3 + + + + sd_journal_seek_head + sd_journal_seek_tail + sd_journal_seek_monotonic_usec + sd_journal_seek_realtime_usec + sd_journal_seek_cursor + Seek to a position in the + journal + + + + + #include <systemd/sd-journal.h> + + + int sd_journal_seek_head + sd_journal* j + + + + int sd_journal_seek_tail + sd_journal* j + + + + int sd_journal_seek_monotonic_usec + sd_journal* j + sd_id128_t boot_id + uint64_t usec + + + + int sd_journal_seek_realtime_usec + sd_journal* j + uint64_t usec + + + + int sd_journal_seek_cursor + sd_journal* j + const char * cursor + + + + + + Description + + sd_journal_seek_head() + seeks to the beginning of the journal, i.e. the oldest + avilable entry. + + Similar, + sd_journal_seek_tail() may be + used to seek to the end of the journal, i.e. the most + recent available entry. + + sd_journal_seek_monotonic_usec() + seeks to the entry with the specified monotonic + timestamp, i.e. CLOCK_MONOOTONIC. Since monotonic time + restarts on every reboot a boot ID needs to be + specified as well. + + sd_journal_seek_realtime_usec() + seeks to the entry with the specified realtime + (wallclock) timestamp, i.e. CLOCK_REALTIME. Note that + the realtime clock is not necessary monotonic. If a + realtime timestamp is ambiguous it is not defined + which position is seeked to. + + sd_journal_seek_cursor() + seeks to the entry located at the specified cursor + string. For details on cursors see + sd_journal_get_cursor3. + + Note that these calls do not actually make any + entry the new current entry, this needs to be done in + a separate step with a subsequent + sd_journal_next3 + invocation (or a similar call). Only then entry data + may be retrieved via + sd_journal_get_data3. If + no entry exists that matches exactly the specified + seek address the next closest is seeked to. If + sd_journal_next3 + is used the closest following entry will be seeked to, + if + sd_journal_previous3 + is used the closest preceeding entry is seeked + to. + + + + Return Value + + The functions return 0 on success or a negative + errno-style error code. + + + + Notes + + The sd_journal_seek_head(), + sd_journal_seek_tail(), + sd_journal_seek_monotonic_usec(), + sd_journal_seek_realtime_usec(), + and sd_journal_seek_cursor() + 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_next3, + sd_journal_get_data3, + sd_journal_get_cursor3, + sd_journal_get_realtime_usec3 + + + + -- cgit v1.2.3-54-g00ecf From 49f43d5f91a99b23f745726aa351d8f159774357 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Sun, 15 Jul 2012 11:41:40 +0300 Subject: Spelling fixes. --- NEWS | 2 +- README | 2 +- TODO | 2 +- man/bootup.xml | 2 +- man/journalctl.xml | 8 ++++---- man/journald.conf.xml | 4 ++-- man/sd_journal_open.xml | 2 +- man/sd_journal_print.xml | 2 +- man/sd_journal_seek_head.xml | 10 +++++----- man/sd_seat_get_active.xml | 2 +- man/systemctl.xml | 6 +++--- man/systemd-delta.xml | 2 +- man/systemd-inhibit.xml | 2 +- man/systemd-readahead-replay.service.xml | 2 +- man/systemd.conf.xml | 2 +- man/systemd.exec.xml | 10 +++++----- src/core/load-fragment.c | 2 +- src/core/shutdown.c | 2 +- src/core/unit.h | 2 +- src/journal/lookup3.c | 6 +++--- src/journal/sd-journal.c | 2 +- src/shared/dbus-common.c | 2 +- units/syslog.target | 2 +- 23 files changed, 39 insertions(+), 39 deletions(-) (limited to 'man/sd_journal_seek_head.xml') diff --git a/NEWS b/NEWS index 7e058d8a4e..b9c452958b 100644 --- a/NEWS +++ b/NEWS @@ -233,7 +233,7 @@ CHANGES WITH 183: to be used as drop-in files. * systemd and logind now handle system sleep states, in - particulary suspending and hibernating. + particular suspending and hibernating. * logind now implements a sleep/shutdown/idle inhibiting logic suitable for a variety of uses. Soonishly Lennart will blog diff --git a/README b/README index d23a3d6d38..dc8e5f5f02 100644 --- a/README +++ b/README @@ -71,7 +71,7 @@ REQUIREMENTS: includes systemd-hostnamed. Note that D-Bus can link against libsystemd-login.so, which - results in a cyclic build dependency. To accomodate for this + results in a cyclic build dependency. To accommodate for this please build D-Bus without systemd first, then build systemd, then rebuild D-Bus with systemd support. diff --git a/TODO b/TODO index 1ec59b2f53..ae9fbc2305 100644 --- a/TODO +++ b/TODO @@ -47,7 +47,7 @@ Features: * man: clarify that time-sync.target is not only sysv compat but also useful otherwise. Same for similar targets -* journalctl should complain if run with uid != 0 and no persistant logs exist +* journalctl should complain if run with uid != 0 and no persistent logs exist * .device aliases need to be implemented with the "following" logic, probably. diff --git a/man/bootup.xml b/man/bootup.xml index ed72acfda9..760a5a4c29 100644 --- a/man/bootup.xml +++ b/man/bootup.xml @@ -53,7 +53,7 @@ A number of different components are involved in the system boot. Immediately after power-up, the system BIOS will do minimal hardware initialization, and hand - control over to a boot loader stored on a persistant + control over to a boot loader stored on a persistent storage device. This boot loader will then invoke an OS kernel from disk (or the network). In the Linux case this kernel now (optionally) extracts and diff --git a/man/journalctl.xml b/man/journalctl.xml index f314fb6d26..05c8703d28 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -141,7 +141,7 @@ Show only most recent - journal entries, and continously print + journal entries, and continuously print new entries as they are appended to the journal. @@ -189,9 +189,9 @@ is very similar but shows monotonic timestamps instead of wallclock timestamps. verbose - shows the full structered entry items + shows the full structured entry items with all - fiels. export + fields. export serializes the journal into a binary (but mostly text-based) stream suitable for backups and network @@ -209,7 +209,7 @@ Suppresses any warning - message regarding inaccessable system + message regarding inaccessible system journals when run as normal user. diff --git a/man/journald.conf.xml b/man/journald.conf.xml index 36227092bb..d7caea83cc 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -174,7 +174,7 @@ influences the granularity in which disk space is made available through rotation, i.e. deletion of historic - data. Defaults to one eigth of the + data. Defaults to one eighth of the values configured with SystemMaxUse= and RuntimeMaxUse=, so @@ -317,7 +317,7 @@ directory /var/log/journal is not created if needed, so that its - existance controls where log data + existence controls where log data goes. none turns off all storage, all log data received will be dropped. Forwarding to other diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml index ffd9a2c481..b99c67da46 100644 --- a/man/sd_journal_open.xml +++ b/man/sd_journal_open.xml @@ -92,7 +92,7 @@ only journal files generated on the local machine will be opened. SD_JOURNAL_RUNTIME_ONLY makes sure only volatile journal files will be opened, - excluding those which are stored on persistant + excluding those which are stored on persistent storage. SD_JOURNAL_SYSTEM_ONLY will ensure that only journal files of system services and the kernel (in opposition to user session processes) will diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml index 05c1ebea77..dfe99192e7 100644 --- a/man/sd_journal_print.xml +++ b/man/sd_journal_print.xml @@ -172,7 +172,7 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid( syslog3 and and sd_journal_print() may - largely be used interchangably + largely be used interchangeably functionality-wise. However, note that log messages logged via the former take a different path to the journal server than the later, and hence global diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml index b6a9a731c1..f8a4eb1d20 100644 --- a/man/sd_journal_seek_head.xml +++ b/man/sd_journal_seek_head.xml @@ -92,7 +92,7 @@ sd_journal_seek_head() seeks to the beginning of the journal, i.e. the oldest - avilable entry. + available entry. Similar, sd_journal_seek_tail() may be @@ -110,7 +110,7 @@ (wallclock) timestamp, i.e. CLOCK_REALTIME. Note that the realtime clock is not necessary monotonic. If a realtime timestamp is ambiguous it is not defined - which position is seeked to. + which position is sought to. sd_journal_seek_cursor() seeks to the entry located at the specified cursor @@ -125,12 +125,12 @@ may be retrieved via sd_journal_get_data3. If no entry exists that matches exactly the specified - seek address the next closest is seeked to. If + seek address the next closest is sought to. If sd_journal_next3 - is used the closest following entry will be seeked to, + is used the closest following entry will be sought to, if sd_journal_previous3 - is used the closest preceeding entry is seeked + is used the closest preceding entry is sought to. diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml index fa47378577..801c16a4bb 100644 --- a/man/sd_seat_get_active.xml +++ b/man/sd_seat_get_active.xml @@ -118,7 +118,7 @@ sd_seat_can_multi_session() may be used to determine whether a specific seat is capable of multi-session, i.e. allows multiple login - sessions in parallel (whith only one being active at a + sessions in parallel (with only one being active at a time). sd_seat_can_tty() may be diff --git a/man/systemctl.xml b/man/systemctl.xml index bf31b6114d..3c0a7950a0 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -447,7 +447,7 @@ When used with - status continously + status continuously prints new journal entries as they are appended to the journal. @@ -1202,10 +1202,10 @@ directory, and the path to the new system manager binary below it to execute as PID 1. If the latter is - ommitted or the empty string, a + omitted or the empty string, a systemd binary will automatically be searched for and used as init. If the - system manager path is ommitted or + system manager path is omitted or equal the empty string the state of the initrd's system manager process is passed to the main system manager, diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml index 9ded28be43..4e57d18fcc 100644 --- a/man/systemd-delta.xml +++ b/man/systemd-delta.xml @@ -155,7 +155,7 @@ When showing modified files, when a file is overridden show a - diff aswell. This option takes a + diff as well. This option takes a boolean argument. diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml index 81ec9ef9ab..e19892b3f1 100644 --- a/man/systemd-inhibit.xml +++ b/man/systemd-inhibit.xml @@ -110,7 +110,7 @@ inhibiting reboot/power-off/halt/kexec, suspending/hibernating, resp. the - automatic idle detection. If ommitted + automatic idle detection. If omitted defaults to idle:sleep:shutdown, i.e. takes all possible diff --git a/man/systemd-readahead-replay.service.xml b/man/systemd-readahead-replay.service.xml index e37b1a9edf..b56fdb8100 100644 --- a/man/systemd-readahead-replay.service.xml +++ b/man/systemd-readahead-replay.service.xml @@ -85,7 +85,7 @@ and systemd-readahead-replay.service are activated at boot so that access patterns from the - preceeding boot are replayed and new data collected + preceding boot are replayed and new data collected for the subsequent boot. However, on read-only media where the collected data cannot be stored it might be a good idea to disable diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml index fb038eaf6d..804a50ead6 100644 --- a/man/systemd.conf.xml +++ b/man/systemd.conf.xml @@ -125,7 +125,7 @@ hierarchy. By default systemd will mount all controllers which are enabled in the kernel in individual - hierachies, with the exception of + hierarchies, with the exception of those listed in this setting. Takes a space separated list of comma separated controller names, in order diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 8d3b3da22e..eff75d033a 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -931,18 +931,18 @@ BlockIOWriteBandwidth= Set the per-device - overall block IO bandwith limit for + overall block IO bandwidth limit for the executed processes. Takes a space separated pair of a file path and a - bandwith value (in bytes per second) + bandwidth value (in bytes per second) to specify the device specific bandwidth. The file path may be specified as path to a block device node or as any other file in which case the backing block device of the file system of the file is determined. - If the bandwith is suffixed with K, M, - G, or T the specified bandwith is + If the bandwidth is suffixed with K, M, + G, or T the specified bandwidth is parsed as Kilobytes, Megabytes, Gigabytes, resp. Terabytes (Example: "/dev/disk/by-path/pci-0000:00:1f.2-scsi-0:0:0:0 @@ -951,7 +951,7 @@ and blkio.write_bps_device control group attributes. Use this - option multiple times to set bandwith + option multiple times to set bandwidth limits for multiple devices. For details about these control group attributes see level0, f, direction == DIRECTION_DOWN ? cp+1 : cp-1, direction, ret, offset); } diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c index ddb50b1eca..3f5ce97680 100644 --- a/src/shared/dbus-common.c +++ b/src/shared/dbus-common.c @@ -1156,7 +1156,7 @@ DBusHandlerResult bus_exit_idle_filter(DBusConnection *bus, DBusMessage *m, void assert(m); assert(remain_until); - /* Everytime we get a new message we reset out timeout */ + /* Every time we get a new message we reset out timeout */ *remain_until = now(CLOCK_MONOTONIC) + DEFAULT_EXIT_USEC; if (dbus_message_is_signal(m, DBUS_INTERFACE_LOCAL, "Disconnected")) diff --git a/units/syslog.target b/units/syslog.target index 87ac886df3..423fef30ad 100644 --- a/units/syslog.target +++ b/units/syslog.target @@ -15,5 +15,5 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/syslog # Avoid that we conflict with shutdown.target, so that we can stay # until the very end and do not cancel shutdown.target if we should -# hapen to be activated very late. +# happen to be activated very late. DefaultDependencies=no -- cgit v1.2.3-54-g00ecf From c6511e859c35b12de4e6fb5f58d7258d9de3b8f2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 10 Oct 2012 22:39:45 +0200 Subject: journal: when browsing the journal via browse.html allow clicking on entries to show their details --- Makefile.am | 4 +- man/sd_journal_get_cursor.xml | 53 +++++++++++++++++------ man/sd_journal_seek_head.xml | 7 ++- src/journal/browse.html | 77 +++++++++++++++++++++++++++++---- src/journal/journal-gatewayd.c | 38 ++++++++++++++++ src/journal/libsystemd-journal.sym | 5 +++ src/journal/sd-journal.c | 88 ++++++++++++++++++++++++++++++++++++-- src/journal/test-journal-stream.c | 16 ++++++- src/systemd/sd-journal.h | 1 + 9 files changed, 263 insertions(+), 26 deletions(-) (limited to 'man/sd_journal_seek_head.xml') diff --git a/Makefile.am b/Makefile.am index 0b3013b444..c23afdf173 100644 --- a/Makefile.am +++ b/Makefile.am @@ -580,7 +580,8 @@ MANPAGES_ALIAS = \ man/sd_journal_seek_tail.3 \ man/sd_journal_seek_monotonic_usec.3 \ man/sd_journal_seek_realtime_usec.3 \ - man/sd_journal_seek_cursor.3 + man/sd_journal_seek_cursor.3 \ + man/sd_journal_test_cursor.3 man/reboot.8: man/halt.8 man/poweroff.8: man/halt.8 @@ -649,6 +650,7 @@ man/sd_journal_seek_tail.3: man/sd_journal_seek_head.3 man/sd_journal_seek_monotonic_usec.3: man/sd_journal_seek_head.3 man/sd_journal_seek_realtime_usec.3: man/sd_journal_seek_head.3 man/sd_journal_seek_cursor.3: man/sd_journal_seek_head.3 +man/sd_journal_test_cursor.3: man/sd_journal_get_cursor.3 XML_FILES = \ ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} diff --git a/man/sd_journal_get_cursor.xml b/man/sd_journal_get_cursor.xml index 9e00ef7c82..354168bee2 100644 --- a/man/sd_journal_get_cursor.xml +++ b/man/sd_journal_get_cursor.xml @@ -44,7 +44,8 @@ sd_journal_get_cursor - Get cursor string for the current journal entry + sd_journal_test_cursor + Get cursor string for or test cursor string against the current journal entry @@ -57,6 +58,12 @@ char ** cursor + + int sd_journal_test_cursor + sd_journal* j + const char * cursor + + @@ -66,7 +73,7 @@ sd_journal_get_cursor() returns a cursor string for the current journal entry. A cursor is a serialization of the current - journal position in text form. The string only + journal position formatted as text. The string only contains printable characters and can be passed around in text form. The cursor identifies a journal entry globally and in a stable way and may be used to later @@ -77,16 +84,33 @@ without the specific entry being available locally will seek to the next closest (in terms of time) available entry. The call takes two arguments: a - journal context object and a pointer to a - string pointer where the cursor string will be - placed. The string is allocated via libc malloc3 and should - be freed after use with + journal context object and a pointer to a string + pointer where the cursor string will be placed. The + string is allocated via libc + malloc3 + and should be freed after use with free3. - Note that this function will not work before + Note that + sd_journal_get_cursor() will not + work before sd_journal_next3 - (or related call) has been called at least - once, in order to position the read pointer at a valid entry. + (or related call) has been called at least once, in + order to position the read pointer at a valid + entry. + + sd_journal_test_cursor() + may be used to check whether the current position in + the journal matches the specified cursor. This is + useful since cursor strings do not uniquely identify + an entry: the same entry might be referred to by + multiple different cursor strings, and hence string + comparing cursors is not possible. Use this call to + verify after an invocation of + sd_journal_seek_cursor3 + whether the entry being seeked to was actually found + in the journal or the next closest entry was used + instead. @@ -94,15 +118,20 @@ sd_journal_get_cursor() returns 0 on success or a negative errno-style error - code. + code. sd_journal_test_cursor() + returns positive if the current entry matches the + specified cursor, 0 if it doesn't match the specified + cursor or a negative errno-style error code on + failure. Notes The sd_journal_get_cursor() - interface is available as shared library, which can be - compiled and linked to with the + and sd_journal_test_cursor() + interfaces are available as shared library, which can + be compiled and linked to with the libsystemd-journal pkg-config1 file. diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml index f8a4eb1d20..b10f069e83 100644 --- a/man/sd_journal_seek_head.xml +++ b/man/sd_journal_seek_head.xml @@ -115,7 +115,12 @@ sd_journal_seek_cursor() seeks to the entry located at the specified cursor string. For details on cursors see - sd_journal_get_cursor3. + sd_journal_get_cursor3. If + no entry matching the specified cursor is found the + call will seek to the next closest entry (in terms of + time) instead. To verify whether the newly selected + entry actually matches the cursor use + sd_journal_test_cursor3. Note that these calls do not actually make any entry the new current entry, this needs to be done in diff --git a/src/journal/browse.html b/src/journal/browse.html index 5ceca26a5d..068b296da1 100644 --- a/src/journal/browse.html +++ b/src/journal/browse.html @@ -4,7 +4,7 @@ Journal @@ -65,6 +95,8 @@
+ +
@@ -271,7 +303,7 @@ else if (d.SYSLOG_PID != undefined) buf += "[" + d.SYSLOG_PID + "]"; - buf += ''; + buf += ''; if (d.MESSAGE == null) buf += "[blob data]"; @@ -280,10 +312,10 @@ else buf += d.MESSAGE; - buf += ''; + buf += ''; } - logs.innerHTML = buf + ''; + logs.innerHTML = '' + buf + ''; if (fc != null) first_cursor = fc; @@ -293,12 +325,41 @@ function entriesMore() { setNEntries(getNEntries() + 10); - entriesLoad(""); + entriesLoad(first_cursor); } function entriesLess() { setNEntries(getNEntries() - 10); - entriesLoad(""); + entriesLoad(first_cursor); + } + + function onResultMessageClick(event) { + if ((event.currentTarget.readyState != 4) || + (event.currentTarget.status != 200 && event.currentTarget.status != 0)) + return; + + var d = JSON.parse(event.currentTarget.responseText); + + document.getElementById("diventry").style.display = "block"; + + entry = document.getElementById("tableentry"); + + var buf = ""; + + for (var key in d){ + buf += '' + key + '' + d[key] + ''; + } + + entry.innerHTML = '' + buf + ''; + } + + function onMessageClick(t) { + var request = new XMLHttpRequest(); + request.open("GET", "/entries?discrete"); + request.onreadystatechange = onResultMessageClick; + request.setRequestHeader("Accept", "application/json"); + request.setRequestHeader("Range", "entries=" + t + ":0:1"); + request.send(null); } machineLoad(); diff --git a/src/journal/journal-gatewayd.c b/src/journal/journal-gatewayd.c index 274ef5ffeb..33dda266b6 100644 --- a/src/journal/journal-gatewayd.c +++ b/src/journal/journal-gatewayd.c @@ -49,6 +49,7 @@ typedef struct RequestMeta { int argument_parse_error; bool follow; + bool discrete; } RequestMeta; static const char* const mime_types[_OUTPUT_MODE_MAX] = { @@ -205,6 +206,19 @@ static ssize_t request_reader_entries( return MHD_CONTENT_READER_END_OF_STREAM; } + if (m->discrete) { + assert(m->cursor); + + r = sd_journal_test_cursor(m->journal, m->cursor); + if (r < 0) { + log_error("Failed to test cursor: %s", strerror(-r)); + return MHD_CONTENT_READER_END_WITH_ERROR; + } + + if (r == 0) + return MHD_CONTENT_READER_END_OF_STREAM; + } + pos -= m->size; m->delta += m->size; @@ -380,6 +394,22 @@ static int request_parse_arguments_iterator( return MHD_YES; } + if (streq(key, "discrete")) { + if (isempty(value)) { + m->discrete = true; + return MHD_YES; + } + + r = parse_boolean(value); + if (r < 0) { + m->argument_parse_error = r; + return MHD_NO; + } + + m->discrete = r; + return MHD_YES; + } + p = strjoin(key, "=", strempty(value), NULL); if (!p) { m->argument_parse_error = log_oom(); @@ -436,6 +466,14 @@ static int request_handler_entries( if (request_parse_arguments(m, connection) < 0) return respond_error(connection, MHD_HTTP_BAD_REQUEST, "Failed to parse URL arguments.\n"); + if (m->discrete) { + if (!m->cursor) + return respond_error(connection, MHD_HTTP_BAD_REQUEST, "Discrete seeks require a cursor specification.\n"); + + m->n_entries = 1; + m->n_entries_set = true; + } + if (m->cursor) r = sd_journal_seek_cursor(m->journal, m->cursor); else if (m->n_skip >= 0) diff --git a/src/journal/libsystemd-journal.sym b/src/journal/libsystemd-journal.sym index 7dfae2625f..77de862dcb 100644 --- a/src/journal/libsystemd-journal.sym +++ b/src/journal/libsystemd-journal.sym @@ -75,3 +75,8 @@ LIBSYSTEMD_JOURNAL_190 { global: sd_journal_get_usage; } LIBSYSTEMD_JOURNAL_188; + +LIBSYSTEMD_JOURNAL_195 { +global: + sd_journal_test_cursor; +} LIBSYSTEMD_JOURNAL_190; diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c index 9e594a2cff..88b382f4cc 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -951,9 +951,8 @@ _public_ int sd_journal_get_cursor(sd_journal *j, char **cursor) { } _public_ int sd_journal_seek_cursor(sd_journal *j, const char *cursor) { - char *w; + char *w, *state; size_t l; - char *state; unsigned long long seqnum, monotonic, realtime, xor_hash; bool seqnum_id_set = false, @@ -966,7 +965,7 @@ _public_ int sd_journal_seek_cursor(sd_journal *j, const char *cursor) { if (!j) return -EINVAL; - if (!cursor) + if (isempty(cursor)) return -EINVAL; FOREACH_WORD_SEPARATOR(w, l, cursor, ";", state) { @@ -1057,6 +1056,89 @@ _public_ int sd_journal_seek_cursor(sd_journal *j, const char *cursor) { return 0; } +_public_ int sd_journal_test_cursor(sd_journal *j, const char *cursor) { + int r; + char *w, *state; + size_t l; + Object *o; + + if (!j) + return -EINVAL; + if (isempty(cursor)) + return -EINVAL; + + if (!j->current_file || j->current_file->current_offset <= 0) + return -EADDRNOTAVAIL; + + r = journal_file_move_to_object(j->current_file, OBJECT_ENTRY, j->current_file->current_offset, &o); + if (r < 0) + return r; + + FOREACH_WORD_SEPARATOR(w, l, cursor, ";", state) { + _cleanup_free_ char *item = NULL; + sd_id128_t id; + unsigned long long ll; + int k = 0; + + if (l < 2 || w[1] != '=') + return -EINVAL; + + item = strndup(w, l); + if (!item) + return -ENOMEM; + + switch (w[0]) { + + case 's': + k = sd_id128_from_string(item+2, &id); + if (k < 0) + return k; + if (!sd_id128_equal(id, j->current_file->header->seqnum_id)) + return 0; + break; + + case 'i': + if (sscanf(item+2, "%llx", &ll) != 1) + return -EINVAL; + if (ll != le64toh(o->entry.seqnum)) + return 0; + break; + + case 'b': + k = sd_id128_from_string(item+2, &id); + if (k < 0) + return k; + if (!sd_id128_equal(id, o->entry.boot_id)) + return 0; + break; + + case 'm': + if (sscanf(item+2, "%llx", &ll) != 1) + return -EINVAL; + if (ll != le64toh(o->entry.monotonic)) + return 0; + break; + + case 't': + if (sscanf(item+2, "%llx", &ll) != 1) + return -EINVAL; + if (ll != le64toh(o->entry.realtime)) + return 0; + break; + + case 'x': + if (sscanf(item+2, "%llx", &ll) != 1) + return -EINVAL; + if (ll != le64toh(o->entry.xor_hash)) + return 0; + break; + } + } + + return 1; +} + + _public_ int sd_journal_seek_monotonic_usec(sd_journal *j, sd_id128_t boot_id, uint64_t usec) { if (!j) return -EINVAL; diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c index 707dcc178b..caea2b2c63 100644 --- a/src/journal/test-journal-stream.c +++ b/src/journal/test-journal-stream.c @@ -39,7 +39,7 @@ static void verify_contents(sd_journal *j, unsigned skip) { i = 0; SD_JOURNAL_FOREACH(j) { const void *d; - char *k; + char *k, *c; size_t l; unsigned u; @@ -61,6 +61,10 @@ static void verify_contents(sd_journal *j, unsigned skip) { } free(k); + + assert_se(sd_journal_get_cursor(j, &c) >= 0); + assert_se(sd_journal_test_cursor(j, c) > 0); + free(c); } if (skip > 0) @@ -122,17 +126,27 @@ int main(int argc, char *argv[]) { SD_JOURNAL_FOREACH_BACKWARDS(j) { const void *d; size_t l; + char *c; assert_se(sd_journal_get_data(j, "NUMBER", &d, &l) >= 0); printf("\t%.*s\n", (int) l, (const char*) d); + + assert_se(sd_journal_get_cursor(j, &c) >= 0); + assert_se(sd_journal_test_cursor(j, c) > 0); + free(c); } SD_JOURNAL_FOREACH(j) { const void *d; size_t l; + char *c; assert_se(sd_journal_get_data(j, "NUMBER", &d, &l) >= 0); printf("\t%.*s\n", (int) l, (const char*) d); + + assert_se(sd_journal_get_cursor(j, &c) >= 0); + assert_se(sd_journal_test_cursor(j, c) > 0); + free(c); } sd_journal_flush_matches(j); diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h index 6c18c89425..9a2aab923a 100644 --- a/src/systemd/sd-journal.h +++ b/src/systemd/sd-journal.h @@ -104,6 +104,7 @@ int sd_journal_seek_realtime_usec(sd_journal *j, uint64_t usec); int sd_journal_seek_cursor(sd_journal *j, const char *cursor); int sd_journal_get_cursor(sd_journal *j, char **cursor); +int sd_journal_test_cursor(sd_journal *j, const char *cursor); 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, const sd_id128_t boot_id, uint64_t *from, uint64_t *to); -- cgit v1.2.3-54-g00ecf From bb31a4ac1997c189a344caf554f34c6aabc71aa7 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Fri, 26 Oct 2012 00:16:47 +0200 Subject: man: typo fixes https://bugs.freedesktop.org/show_bug.cgi?id=55890 Fixed typos, serial comma, and removed "either" as there were more than two options. Also did an extra rename of "system-shutdown" to "systemd-shutdown" that was forgotten in commit 8bd3b8620c80d0f2383f2fb04315411fc8077ca1 --- man/loginctl.xml | 2 +- man/sd_id128_to_string.xml | 4 ++-- man/sd_is_fifo.xml | 4 ++-- man/sd_journal_add_match.xml | 2 +- man/sd_journal_get_fd.xml | 2 +- man/sd_journal_next.xml | 2 +- man/sd_journal_open.xml | 4 ++-- man/sd_journal_print.xml | 2 +- man/sd_journal_seek_head.xml | 2 +- man/sd_journal_stream_fd.xml | 2 +- man/sd_login_monitor_new.xml | 6 +++--- man/sd_notify.xml | 4 ++-- man/sd_pid_get_session.xml | 2 +- man/sd_seat_get_active.xml | 4 ++-- man/sd_uid_get_state.xml | 2 +- man/systemctl.xml | 6 +++--- man/systemd-ask-password.xml | 2 +- man/systemd-cgls.xml | 4 ++-- man/systemd-cryptsetup-generator.xml | 12 ++++++------ man/systemd-delta.xml | 2 +- man/systemd-detect-virt.xml | 2 +- man/systemd-fstab-generator.xml | 6 +++--- man/systemd-halt.service.xml | 2 +- man/systemd-inhibit.xml | 2 +- man/systemd-journald.service.xml | 2 +- man/systemd-nspawn.xml | 2 +- man/systemd-suspend.service.xml | 2 +- man/systemd-udevd.service.xml | 4 ++-- man/systemd-vconsole-setup.service.xml | 2 +- man/systemd.automount.xml | 2 +- man/systemd.conf.xml | 6 +++--- man/systemd.journal-fields.xml | 2 +- man/systemd.service.xml | 12 ++++++------ man/systemd.unit.xml | 2 +- man/systemd.xml | 4 ++-- man/tmpfiles.d.xml | 2 +- man/udev.xml | 4 ++-- man/vconsole.conf.xml | 4 ++-- 38 files changed, 66 insertions(+), 66 deletions(-) (limited to 'man/sd_journal_seek_head.xml') diff --git a/man/loginctl.xml b/man/loginctl.xml index 7d9d8a1e2c..5dbc1f6967 100644 --- a/man/loginctl.xml +++ b/man/loginctl.xml @@ -403,7 +403,7 @@ paths in the /sys file system. To create a new seat attach at least one graphics card to a - previously unused seat name. seat + previously unused seat name. Seat names may consist only of a-z, A-Z, 0-9, "-" and "_" and must be prefixed with "seat". To drop assignment of a diff --git a/man/sd_id128_to_string.xml b/man/sd_id128_to_string.xml index eda35b08b1..ec8b263e0d 100644 --- a/man/sd_id128_to_string.xml +++ b/man/sd_id128_to_string.xml @@ -77,7 +77,7 @@ sd_id128_from_string() implements the reverse operation: it takes a 33 - character array with 32 hexadecimial digits + character array with 32 hexadecimal digits (terminated by NUL) and parses them back into an 128 bit ID returned in ret. @@ -89,7 +89,7 @@ When formatting a 128 bit ID into a string it is often easier to use a format string for printf3. This - is easly done using the + is easily done using the SD_ID128_FORMAT_STR and SD_ID128_FORMAT_VAL() macros. For more information see diff --git a/man/sd_is_fifo.xml b/man/sd_is_fifo.xml index 27e9a0de8f..595c8f112d 100644 --- a/man/sd_is_fifo.xml +++ b/man/sd_is_fifo.xml @@ -107,7 +107,7 @@ sd_is_socket() may be called to check whether the specified file descriptor - refers to a socket. It the + refers to a socket. If the family parameter is not AF_UNSPEC it is checked whether the socket is of the specified family (AF_UNIX, AF_INET, ...). If the @@ -129,7 +129,7 @@ optionally checks the IPv4 or IPv6 port number the socket is bound to, unless port is zero. For this call family - must be passed as either AF_UNSPEC, AF_INET or + must be passed as either AF_UNSPEC, AF_INET, or AF_INET6. sd_is_socket_unix() is diff --git a/man/sd_journal_add_match.xml b/man/sd_journal_add_match.xml index 4aadf6cf00..f9ffc91326 100644 --- a/man/sd_journal_add_match.xml +++ b/man/sd_journal_add_match.xml @@ -122,7 +122,7 @@ again. Note that filtering via matches only applies to - way the journal is read, it has no effect on storage + the way the journal is read, it has no effect on storage on disk. diff --git a/man/sd_journal_get_fd.xml b/man/sd_journal_get_fd.xml index 7fb151edd6..e3b5eaa13d 100644 --- a/man/sd_journal_get_fd.xml +++ b/man/sd_journal_get_fd.xml @@ -81,7 +81,7 @@ sd_journal_get_fd() returns a file descriptor that may be asynchronously polled in - an external event loop and is signalled readable as + an external event loop and is signaled readable as soon as the journal changes, for example because new entries were added. The file descriptor is suitable for usage in diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml index 58e7cec6f3..9b1cb1fc46 100644 --- a/man/sd_journal_next.xml +++ b/man/sd_journal_next.xml @@ -128,7 +128,7 @@ as a wrapper around sd_journal_seek_head3 and sd_journal_next() in order to - make iteratring through the journal easier. See below + make iterating through the journal easier. See below for an example. Similar, SD_JOURNAL_FOREACH_BACKWARDS() may be used for iterating the journal in reverse diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml index b99c67da46..06d0ccfd12 100644 --- a/man/sd_journal_open.xml +++ b/man/sd_journal_open.xml @@ -80,7 +80,7 @@ Description - sd_journal_open() opens the + sd_journal_open() opens the log journal for reading. It will find all journal files automatically and interleave them automatically when reading. As first argument it takes a pointer to @@ -120,7 +120,7 @@ See sd_journal_next3 for an example how to iterate through the journal - after opening it it with + after opening it with sd_journal_open(). A journal context object returned by diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml index 41414bbc09..7742268f5d 100644 --- a/man/sd_journal_print.xml +++ b/man/sd_journal_print.xml @@ -194,7 +194,7 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid( sd-journal.h. syslog3 - and and sd_journal_print() may + and sd_journal_print() may largely be used interchangeably functionality-wise. However, note that log messages logged via the former take a different path to the diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml index b10f069e83..3716c5d367 100644 --- a/man/sd_journal_seek_head.xml +++ b/man/sd_journal_seek_head.xml @@ -108,7 +108,7 @@ sd_journal_seek_realtime_usec() seeks to the entry with the specified realtime (wallclock) timestamp, i.e. CLOCK_REALTIME. Note that - the realtime clock is not necessary monotonic. If a + the realtime clock is not necessarily monotonic. If a realtime timestamp is ambiguous it is not defined which position is sought to. diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml index 662c7bbbb9..4407296b40 100644 --- a/man/sd_journal_stream_fd.xml +++ b/man/sd_journal_stream_fd.xml @@ -96,7 +96,7 @@ for more information. It is recommended that applications log UTF-8 - mesages only with this API, but this is not + messages only with this API, but this is not enforced. diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml index ce17159541..35cb6b368b 100644 --- a/man/sd_login_monitor_new.xml +++ b/man/sd_login_monitor_new.xml @@ -83,20 +83,20 @@ Description sd_login_monitor_new() may - be used to monitor login session, users and seats. Via + be used to monitor login sessions, users and seats. Via a monitor object a file descriptor can be integrated into an application defined event loop which is woken up each time a user logs in, logs out or a seat is added or removed, or a session, user, or seat changes state otherwise. The first parameter takes a string - which can be either seat (to get + which can be seat (to get only notifications about seats being added, removed or changed), session (to get only notifications about sessions being created or removed or changed) or uid (to get only notifications when a user changes state in respect to logins). If notifications shall be generated in all - these conditions, NULL may be passed. Note that in + these conditions, NULL may be passed. Note that in the future additional categories may be defined. The second parameter returns a monitor object and needs to be freed with the diff --git a/man/sd_notify.xml b/man/sd_notify.xml index 5f86e86fec..75edeeadf3 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -87,7 +87,7 @@ processes. The state parameter - should contain an newline-separated list of variable + should contain a newline-separated list of variable assignments, similar in style to an environment block. A trailing newline is implied if none is specified. The string may contain any kind of variable @@ -104,7 +104,7 @@ definition file has Type=notify set. The passed argument is a boolean "1" or "0". Since there is little - value in signalling non-readiness, the + value in signaling non-readiness, the only value daemons should send is "READY=1". diff --git a/man/sd_pid_get_session.xml b/man/sd_pid_get_session.xml index 7897a2cd3e..9517795f78 100644 --- a/man/sd_pid_get_session.xml +++ b/man/sd_pid_get_session.xml @@ -114,7 +114,7 @@ and not being a shared process of a user this function will fail. - If the pid paramater of any + If the pid parameter of any of these functions is passed as 0 the operation is executed for the calling process. diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml index 778f9aeaf9..b1d6d20edf 100644 --- a/man/sd_seat_get_active.xml +++ b/man/sd_seat_get_active.xml @@ -140,8 +140,8 @@ Return Value On success - sd_seat_get_active() return - return 0 or a positive integer. On success + sd_seat_get_active() + returns 0 or a positive integer. On success sd_seat_get_sessions() returns the number of entries in the session identifier array. If the test succeeds diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml index 183e8a600a..b7bc944b14 100644 --- a/man/sd_uid_get_state.xml +++ b/man/sd_uid_get_state.xml @@ -120,7 +120,7 @@ sd_uid_get_sessions() may be used to determine the current sessions of the - specified user. Acceptes a Unix user identifier as + specified user. Accepts a Unix user identifier as parameter. The require_active parameter controls whether the returned list shall consist of only those sessions where the user is diff --git a/man/systemctl.xml b/man/systemctl.xml index c452dfc43f..d547410696 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -178,7 +178,7 @@ execute it immediately. If passed no required units of the unit passed will be pulled in, and no ordering - dependencies will be honoured. This is + dependencies will be honored. This is mostly a debugging and rescue tool for the administrator and should not be used by @@ -766,7 +766,7 @@ configuration after completing the disabling of the units. Note that this command does not implicitly stop the - units that is being disabled. If this + units that are being disabled. If this is desired an additional stop command should be executed afterwards. @@ -789,7 +789,7 @@ is-enabled [NAME...] Checks whether any of - the specified unit files is enabled + the specified unit files are enabled (as with enable). Returns an exit code of 0 if at least one is diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml index e46241b67f..7b0b9ab809 100644 --- a/man/systemd-ask-password.xml +++ b/man/systemd-ask-password.xml @@ -90,7 +90,7 @@ url="http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents">systemd Password Agent Specification. - If a password is queried on a tty the user may + If a password is queried on a TTY the user may press TAB to hide the asterisks normally shown for each character typed. Pressing Backspace as first key achieves the same effect. diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml index 0666937c16..4b6ee93b4e 100644 --- a/man/systemd-cgls.xml +++ b/man/systemd-cgls.xml @@ -70,7 +70,7 @@ to. Otherwise the full systemd control group hierarchy is shown. - By default empty control cgroups are not + By default empty control groups are not shown. @@ -107,7 +107,7 @@ Don't hide empty control groups in the - outpout. + output. diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml index ec2b5e4e32..49d4d5545b 100644 --- a/man/systemd-cryptsetup-generator.xml +++ b/man/systemd-cryptsetup-generator.xml @@ -83,9 +83,9 @@ no disables the generator entirely. rd.luks= - is honoured only be initial RAM disk + is honored only by initial RAM disk (initrd) while - luks= is honoured + luks= is honored by both the main system and the initrd. @@ -104,10 +104,10 @@ (luks.uuid= will still work however). rd.luks.crypttab= - is honoured only be initial RAM disk + is honored only by initial RAM disk (initrd) while luks.crypttab= is - honoured by both the main system and + honored by both the main system and the initrd. @@ -124,10 +124,10 @@ option may be specified more than once in order to set up multiple devices. rd.luks.uuid= - is honoured only be initial RAM disk + is honored only by initial RAM disk (initrd) while luks.uuid= is - honoured by both the main system and + honored by both the main system and the initrd. diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml index 4e57d18fcc..c66d7e8875 100644 --- a/man/systemd-delta.xml +++ b/man/systemd-delta.xml @@ -109,7 +109,7 @@ comma-separated list of desired difference types. - Recognised types are: + Recognized types are: diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml index 75cc714f52..762b6ab992 100644 --- a/man/systemd-detect-virt.xml +++ b/man/systemd-detect-virt.xml @@ -58,7 +58,7 @@ systemd-detect-virt detects execution in a virtualized environment. It identifies - the virtualization technology and can distuingish full + the virtualization technology and can distinguish full VM virtualization from container virtualization. diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml index 87cc35b7d1..2decec6c40 100644 --- a/man/systemd-fstab-generator.xml +++ b/man/systemd-fstab-generator.xml @@ -59,7 +59,7 @@ for details) into native systemd units early at boot and when configuration of the system manager is reloaded. This will instantiate mount and swap units - units as necessary. + as necessary. See systemd.mount5 @@ -94,10 +94,10 @@ generator to ignore any mounts or swaps configured in /etc/fstab. rd.fstab= - is honoured only be initial RAM disk + is honored only by initial RAM disk (initrd) while luks.fstab= is - honoured by both the main system and + honored by both the main system and the initrd. diff --git a/man/systemd-halt.service.xml b/man/systemd-halt.service.xml index e15361ae48..6a6bfdc7d7 100644 --- a/man/systemd-halt.service.xml +++ b/man/systemd-halt.service.xml @@ -85,7 +85,7 @@ Immediately before executing the actual system halt/poweroff/reboot/kexec - system-shutdown will run all + systemd-shutdown will run all executables in /usr/lib/systemd/system-shutdown/ and pass one arguments to them: either diff --git a/man/systemd-inhibit.xml b/man/systemd-inhibit.xml index 5f26c96546..6f63c8c73e 100644 --- a/man/systemd-inhibit.xml +++ b/man/systemd-inhibit.xml @@ -160,7 +160,7 @@ may be specified in systemd-logind.conf5. Note that delay is only - available or sleep + available for sleep and shutdown. diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml index 90f9290276..abc03df5db 100644 --- a/man/systemd-journald.service.xml +++ b/man/systemd-journald.service.xml @@ -134,7 +134,7 @@ Kernel Command Line A few configuration parameters from - journald.conf may be overriden on + journald.conf may be overridden on the kernel command line: diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 71ce0aca43..fef5c2c83a 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -220,7 +220,7 @@ list of capability names, see capabilities7 for more information. Note that the - the following capabilities will be + following capabilities will be granted in any way: CAP_CHOWN, CAP_DAC_OVERRIDE, CAP_DAC_READ_SEARCH, CAP_FOWNER, CAP_FSETID, CAP_IPC_OWNER, diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml index d3e08a8f1d..604aab6f6b 100644 --- a/man/systemd-suspend.service.xml +++ b/man/systemd-suspend.service.xml @@ -64,7 +64,7 @@ for the actual system suspend. Similar, systemd-hibernate.service is pulled in by hibernate.target to - executed the actual hibernation. + execute the actual hibernation. Immediately before entering system suspend and hibernation diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml index 0dd5d10089..92fb38f067 100644 --- a/man/systemd-udevd.service.xml +++ b/man/systemd-udevd.service.xml @@ -83,7 +83,7 @@ - Delay the execution of RUN intruction by the given + Delay the execution of RUN instruction by the given number of seconds. This option might be useful when debugging system crashes during coldplug caused by loading non-working kernel modules. @@ -148,7 +148,7 @@ udev.exec-delay= rd.udev.exec-delay= - Delay the execution of RUN intruction by the given + Delay the execution of RUN instruction by the given number of seconds. This option might be useful when debugging system crashes during coldplug caused by loading non-working kernel modules. diff --git a/man/systemd-vconsole-setup.service.xml b/man/systemd-vconsole-setup.service.xml index b31177e58b..c1ef80dae4 100644 --- a/man/systemd-vconsole-setup.service.xml +++ b/man/systemd-vconsole-setup.service.xml @@ -73,7 +73,7 @@ Kernel Command Line A few configuration parameters from - vconsole.conf may be overriden on + vconsole.conf may be overridden on the kernel command line: diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml index 43006d4dc9..fe559e1dcb 100644 --- a/man/systemd.automount.xml +++ b/man/systemd.automount.xml @@ -130,7 +130,7 @@ Takes an absolute path of a directory of the automount point. If the automount point is not - existing at time of the automount + existing at time that the automount point is installed it is created. This string must be reflected in the unit file name. (See above.) This option is diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml index 7776c8f4f7..a6be932c73 100644 --- a/man/systemd.conf.xml +++ b/man/systemd.conf.xml @@ -201,7 +201,7 @@ capabilities will be included, the effect of the assignment inverted. Note that this option also - effects the respective capabilities in + affects the respective capabilities in the effective, permitted and inheritable capability sets. The capability bounding set may also be @@ -220,7 +220,7 @@ Sets the timer slack in nanoseconds for PID 1 which is then inherited to all executed processes, - unless overriden individually, for + unless overridden individually, for example with the TimerSlackNSec= setting in service units (for details @@ -264,7 +264,7 @@ infinity to configure no limit on a specific resource. These settings may be - overriden in individual units + overridden in individual units using the corresponding LimitXXX= directives. Note that these resource limits are only defaults for units, diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml index e212c811fd..d95cb011d9 100644 --- a/man/systemd.journal-fields.xml +++ b/man/systemd.journal-fields.xml @@ -215,7 +215,7 @@ _SYSTEMD_OWNER_UID= - The contol group path in + The control group path in the systemd hierarchy, the systemd session ID (if any), the systemd unit name (if any) diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 59ecf810fb..00a6398a1e 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -100,7 +100,7 @@ script. This is useful for compatibility with SysV. Note that this compatibility is quite comprehensive but not 100%. For details about the - incomptibilities see the Incompatibilities with SysV document. @@ -219,7 +219,7 @@ Behavior of is very similar to , however - actual execution of a the service + actual execution of the service binary is delayed until all jobs are dispatched. This may be used to avoid interleaving of output of shell @@ -245,7 +245,7 @@ Takes a boolean value that specifies whether systemd should try to guess the main PID of a service - should if it cannot be determined + if it cannot be determined reliably. This option is ignored unless is set and @@ -283,7 +283,7 @@ BusName= Takes a D-Bus bus - name, where this service is reachable + name, that this service is reachable as. This option is mandatory for services where Type= is set to @@ -341,7 +341,7 @@ variable substitution is supported. Use ${FOO} as part of a - word, or as word of its own on the + word, or as a word of its own on the command line, in which case it will be replaced by the value of the environment variable including all @@ -578,7 +578,7 @@ 0. If set to it will be restarted only when it exited with an - exit code not equalling 0, when + exit code not equaling 0, when terminated by a signal (including on core dump), when an operation (such as service reload) times out or when the diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index afad56c5b2..f23aad9fa0 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -75,7 +75,7 @@ inspired by Microsoft Windows .ini files. - This man pages lists the common configuration + This man page lists the common configuration options of all the unit types. These options need to be configured in the [Unit] or [Install] sections of the unit files. diff --git a/man/systemd.xml b/man/systemd.xml index 77585248a9..7b3d265b8d 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -1002,7 +1002,7 @@ systemd.special7 for details about these units. The option prefixed with - rd. is honoured + rd. is honored only in the initial RAM disk (initrd), while the one that isn't prefixed only in the main system. @@ -1101,7 +1101,7 @@ process and all its children at boot time. May be used more than once to set multiple variables. If the equal - sign and variable are missing unsets + sign and variable are missing it unsets an environment variable which might be passed in from the initial ram disk. diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml index 91bc8e5571..785264e3cf 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -161,7 +161,7 @@ L /tmp/foobar - - - - /dev/null effect of r or R lines. Lines of this type accept shell-style globs in place of - of normal path + normal path names. diff --git a/man/udev.xml b/man/udev.xml index 0746618d00..7ec7a3fed0 100644 --- a/man/udev.xml +++ b/man/udev.xml @@ -94,7 +94,7 @@ extensions are ignored. Every line in the rules file contains at least one key-value pair. - There are two kind of keys: match and assignment. + There are two kinds of keys: match and assignment. If all match keys are matching against its value, the rule gets applied and the assignment keys get the specified value assigned. @@ -327,7 +327,7 @@ The name to use for a network interface. The name of a device node - can not be changed by udev, only additional symlinks can be created. + cannot be changed by udev, only additional symlinks can be created. diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml index 258c82bc62..45156b7447 100644 --- a/man/vconsole.conf.xml +++ b/man/vconsole.conf.xml @@ -61,7 +61,7 @@ The basic file format of the vconsole.conf is a - newline-separated list environment-like + newline-separated list of environment-like shell-compatible variable assignments. It is possible to source the configuration from shell scripts, however, beyond mere variable assignments no shell @@ -100,7 +100,7 @@ defaults to us if not set. The KEYMAP_TOGGLE= can - be used to configured a second toggle + be used to configure a second toggle keymap and is by default unset. -- cgit v1.2.3-54-g00ecf