1
0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00

Merge pull request #1420 from keszybz/doc-updates

Doc updates
This commit is contained in:
Daniel Mack 2015-09-30 18:37:18 +02:00
commit 75ec4439ea
7 changed files with 39 additions and 30 deletions

4
NEWS
View File

@ -17,7 +17,7 @@ CHANGES WITH 227:
It allows accounting the number of tasks in a cgroup and It allows accounting the number of tasks in a cgroup and
enforcing limits on it. This adds two new setting enforcing limits on it. This adds two new setting
TasksAccounting= and TasksMax= to each unit, as well as a TasksAccounting= and TasksMax= to each unit, as well as a
gloabl option DefaultTasksAccounting=. global option DefaultTasksAccounting=.
* Support for the "net_cls" cgroup controller has been added. * Support for the "net_cls" cgroup controller has been added.
It allows assigning a net class ID to each task in the cgroup, It allows assigning a net class ID to each task in the cgroup,
@ -27,7 +27,7 @@ CHANGES WITH 227:
sockets. sockets.
This adds a new config directive called NetClass= to CGroup This adds a new config directive called NetClass= to CGroup
enabled units. Allowed values are positive numbers for fix enabled units. Allowed values are positive numbers for fixed
assignments and "auto" for picking a free value assignments and "auto" for picking a free value
automatically. automatically.

View File

@ -119,7 +119,7 @@ id[8] = (id[8] &amp; 0x3F) | 0x80;</programlisting>
<filename>/etc/machine-id</filename> originates in the <filename>/etc/machine-id</filename> originates in the
<filename>/var/lib/dbus/machine-id</filename> file introduced by <filename>/var/lib/dbus/machine-id</filename> file introduced by
D-Bus. In fact, this latter file might be a symlink to D-Bus. In fact, this latter file might be a symlink to
<varname>/etc/machine-id</varname>.</para> <filename>/etc/machine-id</filename>.</para>
</refsect1> </refsect1>
<refsect1> <refsect1>

View File

@ -287,7 +287,7 @@
below (see section "Command Lines" below). below (see section "Command Lines" below).
</para> </para>
<para>When <varname>Type</varname> is not <para>When <varname>Type=</varname> is not
<option>oneshot</option>, only one command may and must be <option>oneshot</option>, only one command may and must be
given. When <varname>Type=oneshot</varname> is used, zero or given. When <varname>Type=oneshot</varname> is used, zero or
more commands may be specified. This can be specified by more commands may be specified. This can be specified by
@ -421,7 +421,7 @@
<varname>ExecStop=</varname> defined, or where the service <varname>ExecStop=</varname> defined, or where the service
exited unexpectedly. This argument takes multiple command exited unexpectedly. This argument takes multiple command
lines, following the same scheme as described for lines, following the same scheme as described for
<varname>ExecStart</varname>. Use of these settings is <varname>ExecStart=</varname>. Use of these settings is
optional. Specifier and environment variable substitution is optional. Specifier and environment variable substitution is
supported.</para></listitem> supported.</para></listitem>
</varlistentry> </varlistentry>
@ -486,7 +486,7 @@
"keep-alive ping"). If the time between two such calls is "keep-alive ping"). If the time between two such calls is
larger than the configured time, then the service is placed in larger than the configured time, then the service is placed in
a failed state and it will be terminated with a failed state and it will be terminated with
<varname>SIGABRT</varname>. By setting <constant>SIGABRT</constant>. By setting
<varname>Restart=</varname> to <option>on-failure</option> or <varname>Restart=</varname> to <option>on-failure</option> or
<option>always</option>, the service will be automatically <option>always</option>, the service will be automatically
restarted. The time configured here will be passed to the restarted. The time configured here will be passed to the
@ -905,12 +905,15 @@
<varlistentry> <varlistentry>
<term><varname>USBFunctionDescriptors=</varname></term> <term><varname>USBFunctionDescriptors=</varname></term>
<listitem><para>Configure the location of file containing <listitem><para>Configure the location of the file containing
FunctionFS descriptors. This is is used only when socket with <ulink url="https://www.kernel.org/doc/Documentation/usb/functionfs.txt">functionfs</ulink>
<varname>ListenUSBFunction</varname> line want to activate this service. Content of descriptors. This is is used only when a socket with
this file is writen to ep0 file after it is opened. This is required <varname>ListenUSBFunction=</varname> configured wants to
for socket activation using <varname>ListenUSBFunction</varname> activate this service. Content of this file is writen to
(i.e. for passing all ffs endpoints to service).</para></listitem> <filename>ep0</filename> file after it is opened. This is
required for socket activation using
<varname>ListenUSBFunction=</varname> (i.e. for passing all
functionfs endpoints to the service).</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

View File

@ -262,13 +262,17 @@
<varlistentry> <varlistentry>
<term><varname>ListenUSBFunction=</varname></term> <term><varname>ListenUSBFunction=</varname></term>
<listitem><para>Specifies a functionfs endpoint location <listitem><para>Specifies a
to listen on. This expects an absolute file system path as <ulink url="https://www.kernel.org/doc/Documentation/usb/functionfs.txt">functionfs</ulink>
endpoint location to
listen on. This expects an absolute file system path as the
argument. Behavior otherwise is very similar to the argument. Behavior otherwise is very similar to the
<varname>ListenFIFO=</varname> directive above. Use this to <varname>ListenFIFO=</varname> directive above. Use this to
open functionfs endpoint ep0. When using this option, activated open functionfs endpoint <filename>ep0</filename>. When using
service has to have <varname>USBFunctionDescriptors</varname> this option, activated service has to have the
and <varname>USBFunctionStrings</varname> options set.</para></listitem> <varname>USBFunctionDescriptors=</varname> and
<varname>USBFunctionStrings=</varname> options set.
</para></listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

View File

@ -215,20 +215,19 @@
<term><filename>exit.target</filename></term> <term><filename>exit.target</filename></term>
<listitem> <listitem>
<para>A special service unit for shutting down the system or <para>A special service unit for shutting down the system or
user service manager. It also works in containers and is user service manager. It is equivalent to
equivalent to <filename>poweroff.target</filename> on <filename>poweroff.target</filename> on non-container
non-container systems.</para> systems, and also works in containers.</para>
<para>Applications wanting to terminate the user service <para>systemd will start this unit when it receives a
manager should start this unit. If systemd receives request to shut down over D-Bus or a
<constant>SIGTERM</constant> or <constant>SIGINT</constant> <constant>SIGTERM</constant> or <constant>SIGINT</constant>
when running as user service daemon, it will start this signal when running as user service daemon.</para>
unit.</para>
<para>Normally, this pulls in <para>Normally, this (indirectly) pulls in
<filename>shutdown.target</filename> which in turn should be <filename>shutdown.target</filename> which in turn should be
conflicted by all units that want to be shut down on user conflicted by all units that want to be scheduled for
service manager exit.</para> shutdown when the service manager starts to exit.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

View File

@ -1055,8 +1055,11 @@
<literal>auto</literal> (for dynamic allocation). Network traffic of <literal>auto</literal> (for dynamic allocation). Network traffic of
all processes inside the unit will have the network class ID assigned all processes inside the unit will have the network class ID assigned
by the kernel. Also see by the kernel. Also see
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry> the kernel docs for
.</para></listitem> <ulink url="https://www.kernel.org/doc/Documentation/cgroups/net_cls.txt">net_cls controller</ulink>
and
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
</para></listitem>
</varlistentry> </varlistentry>
</variablelist> </variablelist>

View File

@ -178,7 +178,7 @@
protected by a different access policy.</para> protected by a different access policy.</para>
<para>Note that even if time synchronization is turned off <para>Note that even if time synchronization is turned off
with this command another, unrelated system service might with this command, another unrelated system service might
still synchronize the clock with the network. Also note that still synchronize the clock with the network. Also note that
strictly speaking strictly speaking
<filename>systemd-timesyncd.service</filename> does more than <filename>systemd-timesyncd.service</filename> does more than