diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-07-19 17:55:52 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-07-19 17:55:52 +0200 |
| commit | 431c72dc3d482732a01d3ab929aa9b2c36422d46 (patch) | |
| tree | 0c7bc5053e6445e2274273b660a745d6a735a154 | |
| parent | 3803cde44c3d949765bdf0e8bce06886224d40b4 (diff) | |
man: update systemd-nspawn regarding new --slice= logic
| -rw-r--r-- | TODO | 4 | ||||
| -rw-r--r-- | man/systemd-nspawn.xml | 23 |
2 files changed, 14 insertions, 13 deletions
@@ -45,8 +45,8 @@ CGroup Rework Completion: * introduce high-level settings for RT budget, swappiness -* wiki: document new bus APIs of PID 1 (transient units, Reloading signal), systemctl commands -* review: scope units, slice units, pid1, machinectl, libsystem-login, pam_systemd, systemd-run, systemd-nspawn +* wiki: document new bus APIs of PID 1 (transient units, Reloading signal) +* review: scope units, slice units, pid1, machinectl, libsystem-login, pam_system, systemctl commands * Send SIGHUP and SIGTERM in session scopes diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index feafb31bc0..f4c5d77eed 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -240,6 +240,16 @@ </varlistentry> <varlistentry> + <term><option>--slice=</option></term> + + <listitem><para>Make the container + part of the specified slice, instead + of the + <filename>machine.slice</filename>.</para> + </listitem> + </varlistentry> + + <varlistentry> <term><option>--uuid=</option></term> <listitem><para>Set the specified UUID @@ -251,16 +261,6 @@ </varlistentry> <varlistentry> - <term><option>-C</option></term> - <term><option>--controllers=</option></term> - - <listitem><para>Makes the container appear in - other hierarchies than the name=systemd:/ one. - Takes a comma-separated list of controllers. - </para></listitem> - </varlistentry> - - <varlistentry> <term><option>--private-network</option></term> <listitem><para>Turn off networking in @@ -443,7 +443,8 @@ <citerefentry><refentrytitle>unshare</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>yum</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>, - <citerefentry><refentrytitle>pacman</refentrytitle><manvolnum>8</manvolnum></citerefentry> + <citerefentry><refentrytitle>pacman</refentrytitle><manvolnum>8</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry> </para> </refsect1> |