diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-07-25 17:24:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-25 17:24:35 +0200 |
| commit | 26598be814ae4f64de812898e4012fb329559326 (patch) | |
| tree | 9cf2c22e3c5d3ff6044eb133c852c44f5bcdc935 /man/systemd-nspawn.xml | |
| parent | 43eb109aa9b8952dbcbfc0ae564d91c180f5d93a (diff) | |
| parent | 93f07c87890a54c956eac38f206161071a968a55 (diff) | |
Merge pull request #3798 from keszybz/news-and-man-tweaks
News and man tweaks
Diffstat (limited to 'man/systemd-nspawn.xml')
| -rw-r--r-- | man/systemd-nspawn.xml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index cb0468fbf5..9b623c8353 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -73,11 +73,9 @@ since it fully virtualizes the file system hierarchy, as well as the process tree, the various IPC subsystems and the host and domain name.</para> - <para>Like <citerefentry - project='man-pages'><refentrytitle>chroot</refentrytitle><manvolnum>1</manvolnum></citerefentry> the - <command>systemd-nspawn</command> command may be invoked on any directory tree containing an operating system tree, + <para><command>systemd-nspawn</command> may be invoked on any directory tree containing an operating system tree, using the <option>--directory=</option> command line option. By using the <option>--machine=</option> option an OS - tree is automatically searched in a couple of locations, most importantly in + tree is automatically searched for in a couple of locations, most importantly in <filename>/var/lib/machines</filename>, the suggested directory to place container images installed on the system.</para> @@ -935,8 +933,8 @@ <literal>tmpfs</literal> instance, and <filename>/usr</filename> from the OS tree is mounted into it in read-only mode (the system thus starts up with read-only OS - resources, but pristine state and configuration, any changes - to the either are lost on shutdown). When the mode parameter + image, but pristine state and configuration, any changes + are lost on shutdown). When the mode parameter is specified as <option>state</option>, the OS tree is mounted read-only, but <filename>/var</filename> is mounted as a <literal>tmpfs</literal> instance into it (the system thus |