man: update systemd-nspawn regarding new --slice= logic

This commit is contained in:
Lennart Poettering 2013-07-19 17:55:52 +02:00
parent 3803cde44c
commit 431c72dc3d
2 changed files with 14 additions and 13 deletions

4
TODO
View File

@ -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

View File

@ -239,6 +239,16 @@
container is used.</para></listitem>
</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>
@ -250,16 +260,6 @@
</para></listitem>
</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>
@ -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>