diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/sd_notify.xml | 2 | ||||
| -rw-r--r-- | man/systemd-tmpfiles.xml | 4 | ||||
| -rw-r--r-- | man/systemd.path.xml | 17 | ||||
| -rw-r--r-- | man/systemd.service.xml | 4 | ||||
| -rw-r--r-- | man/systemd.socket.xml | 13 | ||||
| -rw-r--r-- | man/systemd.xml | 2 | ||||
| -rw-r--r-- | man/tmpfiles.d.xml | 32 |
7 files changed, 57 insertions, 17 deletions
diff --git a/man/sd_notify.xml b/man/sd_notify.xml index 1b55680748..c3791ce39f 100644 --- a/man/sd_notify.xml +++ b/man/sd_notify.xml @@ -166,7 +166,7 @@ for details.</para> <para><function>sd_notifyf()</function> is similar to - <function>sd_notifyf()</function> but takes a + <function>sd_notify()</function> but takes a <function>printf()</function>-like format string plus arguments.</para> </refsect1> diff --git a/man/systemd-tmpfiles.xml b/man/systemd-tmpfiles.xml index 08d5c73ce6..bbb80b2f98 100644 --- a/man/systemd-tmpfiles.xml +++ b/man/systemd-tmpfiles.xml @@ -84,7 +84,9 @@ <listitem><para>If this option is passed all files and directories marked with f, F, d, D in the configuration files are - created.</para></listitem> + created. Files and directories marked with z, + Z have their ownership, access mode and security + labels set.</para></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd.path.xml b/man/systemd.path.xml index 10d8f73004..5b1ff75f7a 100644 --- a/man/systemd.path.xml +++ b/man/systemd.path.xml @@ -113,6 +113,7 @@ <term><varname>PathExists=</varname></term> <term><varname>PathExistsGlob=</varname></term> <term><varname>PathChanged=</varname></term> + <term><varname>PathModified=</varname></term> <term><varname>DirectoryNotEmpty=</varname></term> <listitem><para>Defines paths to @@ -129,8 +130,14 @@ specified. <varname>PathChanged=</varname> may be used to watch a file or directory and activate the configured - unit whenever it changes or is - modified. <varname>DirectoryNotEmpty=</varname> + unit whenever it changes. It is not activated + on every write to the watched file but it is + activated if the file which was open for writing + gets closed. <varname>PathModified=</varname> + is similar, but additionally it is activated + also on simple writes to the watched file. + + <varname>DirectoryNotEmpty=</varname> may be used to watch a directory and activate the configured unit whenever it contains at least one file.</para> @@ -154,11 +161,7 @@ activated, then the configured unit is immediately activated as well. Something similar does not apply - to - <varname>PathChanged=</varname>. The - latter is not activated on simple - writes but only if files with were - opened for writing are closed. + to <varname>PathChanged=</varname>. </para></listitem> </varlistentry> <varlistentry> diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 7b6f12d069..0baddd1d4f 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -671,11 +671,11 @@ <listitem><para>Specifies the name of the socket units this service shall inherit the sockets from when the - service (ignoring the different suffix - of course) is started. Normally it + service is started. Normally it should not be necessary to use this setting as all sockets whose unit shares the same name as the service + (ignoring the different suffix of course) are passed to the spawned process.</para> diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml index 28c8dc4566..f883543c80 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -156,7 +156,7 @@ family.</para> <para>If the address starts with an - ampersand (@) it is read as abstract + at symbol (@) it is read as abstract namespace socket in the AF_UNIX family. The @ is replaced with a NUL character before binding. For details @@ -525,6 +525,17 @@ </varlistentry> <varlistentry> + <term><varname>PassCred=</varname></term> + <listitem><para>Takes a boolean + value. This controls the SO_PASSCRED + option, which allows UNIX sockets to + receive the credentials of the sending + process in an ancillary message. + Defaults to + <option>false</option>.</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>TCPCongestion=</varname></term> <listitem><para>Takes a string value. Controls the TCP congestion diff --git a/man/systemd.xml b/man/systemd.xml index a8a6967446..c1766e26a4 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -813,7 +813,7 @@ <listitem><para>Sets the log level to <literal>debug</literal> (resp. <literal>info</literal> on - <literal>SIGRTMIN+32</literal>), as + <literal>SIGRTMIN+23</literal>), as controlled via <varname>systemd.log_level=debug</varname> (resp. <varname>systemd.log_level=info</varname> diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml index 7f4c45c960..4a8e8316cd 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -155,6 +155,27 @@ d /run/user 0755 root root 10d</programlisting> place of normal path names.</para></listitem> </varlistentry> + + <varlistentry> + <term><varname>z</varname></term> + <listitem><para>Set ownership, access + mode and relabel security context of + a file or directory if it exists. + Lines of this type accept shell-style + globs in place of normal path names. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><varname>Z</varname></term> + <listitem><para>Recursively set + ownership, access mode and relabel + security context of a path and + all its subdirectories (if it is a + directory). Lines of this type accept + shell-style globs in place of normal + path names.</para></listitem> + </varlistentry> </variablelist> </refsect2> @@ -164,8 +185,10 @@ d /run/user 0755 root root 10d</programlisting> <para>The file access mode to use when creating this file or directory. If omitted or when set to - the default is used: 0755 for - directories, 0644 for files. This parameter is - ignored for x, r, R lines.</para> + directories, 0644 for files. For z, Z lines + if omitted or when set to - the file access mode will + not be modified. This parameter is ignored for x, r, R + lines.</para> </refsect2> <refsect2> @@ -175,8 +198,9 @@ d /run/user 0755 root root 10d</programlisting> or directory. This may either be a numeric user/group ID or a user or group name. If omitted or when set to - the default 0 (root) - is used. . These parameters are ignored for x, - r, R lines.</para> + is used. For z, Z lines when omitted or when set to - + the file ownership will not be modified. + These parameters are ignored for x, r, R lines.</para> </refsect2> <refsect2> |