diff --git a/TODO b/TODO index d111f36e9e..63b1280f04 100644 --- a/TODO +++ b/TODO @@ -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 @@ -239,6 +239,16 @@ container is used. + + + + Make the container + part of the specified slice, instead + of the + machine.slice. + + + @@ -250,16 +260,6 @@ - - - - - Makes the container appear in - other hierarchies than the name=systemd:/ one. - Takes a comma-separated list of controllers. - - - @@ -443,7 +443,8 @@ unshare1, yum8, debootstrap8, - pacman8 + pacman8, + systemd.slice5