diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-07-10 01:33:13 -0400 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-07-10 02:16:20 -0400 |
commit | fade1ec6e05f9f6c3718be622e259d2c8e61508c (patch) | |
tree | 66d45fa836a28a96e01e9eb52e8c468f3eac97c8 | |
parent | beef8df837fb0ef708143b34aa85a897400e8992 (diff) |
man: document four basic slices
-rw-r--r-- | man/machinectl.xml | 3 | ||||
-rw-r--r-- | man/systemd-machined.service.xml | 3 | ||||
-rw-r--r-- | man/systemd.special.xml | 60 |
3 files changed, 63 insertions, 3 deletions
diff --git a/man/machinectl.xml b/man/machinectl.xml index 8a96d423b9..ced304d6d8 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -294,7 +294,8 @@ <title>See Also</title> <para> <citerefentry><refentrytitle>systemd-machined.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, - <citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry> + <citerefentry><refentrytitle>systemd-logind.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>. </para> </refsect1> diff --git a/man/systemd-machined.service.xml b/man/systemd-machined.service.xml index 3094315ecb..a9205d018e 100644 --- a/man/systemd-machined.service.xml +++ b/man/systemd-machined.service.xml @@ -69,7 +69,8 @@ <title>See Also</title> <para> <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, - <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>. + <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>. </para> </refsect1> diff --git a/man/systemd.special.xml b/man/systemd.special.xml index d1cd81f1d1..7dbc5580e2 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.xml @@ -100,7 +100,11 @@ <filename>system-update.target</filename>, <filename>time-sync.target</filename>, <filename>timers.target</filename>, - <filename>umount.target</filename></para> + <filename>umount.target</filename>, + <filename>-.slice</filename>, + <filename>system.slice</filename>, + <filename>user.slice</filename>, + <filename>machine.slice</filename></para> </refsynopsisdiv> <refsect1> @@ -1023,6 +1027,59 @@ </refsect1> <refsect1> + <title>Special Slice Units</title> + + <para>There are four <literal>.slice</literal> units + which form the basis of the hierarchy for assignment + of resources for services, users, and virtual machines + or containers.</para> + + <variablelist> + <varlistentry> + <term><filename>-.slice</filename></term> + <listitem> + <para>The root slice is the + root of the hierarchy. It does + not contain services directly, + but is used to set defaults + for the whole tree.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><filename>system.slice</filename></term> + <listitem> + <para>This slice contains + services started by + <command>systemd</command>.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><filename>user.slice</filename></term> + <listitem> + <para>This slice contains user + processes and services started + on behalf of the user, + including the per-user systemd + instance.</para> + </listitem> + </varlistentry> + + <varlistentry> + <term><filename>machine.slice</filename></term> + <listitem> + <para>This slice contains + virtual machines and + containers registered with + <command>systemd-machined</command>. + </para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + + <refsect1> <title>See Also</title> <para> <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, @@ -1030,6 +1087,7 @@ <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd.target</refentrytitle><manvolnum>5</manvolnum></citerefentry>, + <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>bootup</refentrytitle><manvolnum>7</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-fstab-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry> </para> |