diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-10-02 10:58:31 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-10-02 14:56:26 +0200 |
| commit | 27407a01c6c115ed09ad938ab95dcb56ab963ba9 (patch) | |
| tree | a5f1350183738cdc1e3e4e7233188db2599ffae5 /man | |
| parent | b2e6df73aa508cc09b1b536a2fb9f90f152b89fa (diff) | |
nspawn: use automatic cleanup and provide debug info
The documentation for --link-journal is also reworded.
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-nspawn.xml | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 1688687948..71ce0aca43 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -248,31 +248,30 @@ <literal>host</literal>, <literal>guest</literal>, <literal>auto</literal>. If - <literal>no</literal> the journal is - not linked. If <literal>host</literal> + <literal>no</literal>, the journal is + not linked. If <literal>host</literal>, the journal files are stored on the - host file system (beneath the host's - <filename>/var/log/journal</filename>) - and a per-machine subdirectory of this - directory is created and bind mounted + host file system (beneath + <filename>/var/log/journal/<machine-id></filename>) + and the subdirectory is bind-mounted into the container at the same - location. If <literal>guest</literal> + location. If <literal>guest</literal>, the journal files are stored on the - guest file system (beneath the guest's - <filename>/var/log/journal</filename>) - and a per-machine subdirectory of this - directory is symlinked into the host + guest file system (beneath + <filename>/var/log/journal/<machine-id></filename>) + and the subdirectory is symlinked into the host at the same location. If - <literal>auto</literal> (the default) - and the subdirectory of + <literal>auto</literal> (the default), + and the right subdirectory of <filename>/var/log/journal</filename> - exists as directory it is bind mounted - into the container, but nothing is - done otherwise. Effectively, booting a - container once with + exists, it will be bind mounted + into the container. If the + subdirectory doesn't exist, no + linking is performed. Effectively, + booting a container once with <literal>guest</literal> or <literal>host</literal> will link the - journal persistently if further one + journal persistently if further on the default of <literal>auto</literal> is used.</para></listitem> </varlistentry> |