diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-12-11 22:04:03 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-12-11 22:04:03 +0100 |
| commit | b6741478e7661c7e580e5dcfd6a6fccd1899c1d0 (patch) | |
| tree | b29e463c8113c914a21b45226a845424214ece21 /man | |
| parent | 842129f58752864d4433792c9c47d40508c4439a (diff) | |
journal: add ability to browse journals of running OS containers
This adds the new library call sd_journal_open_container() and a new
"-M" switch to journalctl. Particular care is taken that journalctl's
"-b" switch resolves to the current boot ID of the container, not the
host.
Diffstat (limited to 'man')
| -rw-r--r-- | man/journalctl.xml | 10 | ||||
| -rw-r--r-- | man/sd_journal_open.xml | 18 |
2 files changed, 27 insertions, 1 deletions
diff --git a/man/journalctl.xml b/man/journalctl.xml index 011fea2800..952b37c531 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -648,6 +648,16 @@ </varlistentry> <varlistentry> + <term><option>-M</option></term> + <term><option>--machine=</option></term> + + <listitem><para>Show messages from a + running, local container. Specify a + container name to connect + to.</para></listitem> + </varlistentry> + + <varlistentry> <term><option>-D <replaceable>DIR</replaceable></option></term> <term><option>--directory=<replaceable>DIR</replaceable></option></term> diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml index bb3703d015..b068630982 100644 --- a/man/sd_journal_open.xml +++ b/man/sd_journal_open.xml @@ -46,6 +46,7 @@ <refname>sd_journal_open</refname> <refname>sd_journal_open_directory</refname> <refname>sd_journal_open_files</refname> + <refname>sd_journal_open_container</refname> <refname>sd_journal_close</refname> <refname>sd_journal</refname> <refname>SD_JOURNAL_LOCAL_ONLY</refname> @@ -80,6 +81,13 @@ </funcprototype> <funcprototype> + <funcdef>int <function>sd_journal_open_container</function></funcdef> + <paramdef>sd_journal** <parameter>ret</parameter></paramdef> + <paramdef>const char* <parameter>machine</parameter></paramdef> + <paramdef>int <parameter>flags</parameter></paramdef> + </funcprototype> + + <funcprototype> <funcdef>void <function>sd_journal_close</function></funcdef> <paramdef>sd_journal* <parameter>j</parameter></paramdef> </funcprototype> @@ -131,6 +139,13 @@ can be rotated at any moment, and the opening of specific files is inherently racy.</para> + <para><function>sd_journal_open_container()</function> + is similar to <function>sd_journal_open()</function> + but opens the journal files of a running + OS container. The specified machine name refers to a + container that is registered with + <citerefentry><refentrytitle>systemd-machined</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para> + <para><varname>sd_journal</varname> objects cannot be used in the child after a fork. Functions which take a journal object as an argument @@ -230,7 +245,8 @@ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>sd-journal</refentrytitle><manvolnum>3</manvolnum></citerefentry>, <citerefentry><refentrytitle>sd_journal_next</refentrytitle><manvolnum>3</manvolnum></citerefentry>, - <citerefentry><refentrytitle>sd_journal_get_data</refentrytitle><manvolnum>3</manvolnum></citerefentry> + <citerefentry><refentrytitle>sd_journal_get_data</refentrytitle><manvolnum>3</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd-machined</refentrytitle><manvolnum>8</manvolnum></citerefentry> </para> </refsect1> |