diff options
| -rw-r--r-- | docs/DAEMON_SOCKET_ACTIVATION.md | 6 | ||||
| -rw-r--r-- | man/crypttab.xml | 4 | ||||
| -rw-r--r-- | man/repart.d.xml | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/docs/DAEMON_SOCKET_ACTIVATION.md b/docs/DAEMON_SOCKET_ACTIVATION.md index 1a027a37c8..87328ce4cf 100644 --- a/docs/DAEMON_SOCKET_ACTIVATION.md +++ b/docs/DAEMON_SOCKET_ACTIVATION.md @@ -35,12 +35,14 @@ PrivateNetwork=true **/etc/systemd/system/my-nginx.socket** ``` +[Unit] +After=network.target +Requires=network.target + [Socket] ListenStream=80 ListenStream=0.0.0.0:80 BindIPv6Only=ipv6-only -After=network.target -Requires=network.target [Install] WantedBy=sockets.target diff --git a/man/crypttab.xml b/man/crypttab.xml index 1d92745eb4..955111fe94 100644 --- a/man/crypttab.xml +++ b/man/crypttab.xml @@ -130,7 +130,7 @@ <para>For the latter five mechanisms the source for the key material used for unlocking the volume is primarily configured in the third field of each <filename>/etc/crypttab</filename> line, but may also - configured in <filename>/etc/cryptsetup-keys.d/</filename> and + be configured in <filename>/etc/cryptsetup-keys.d/</filename> and <filename>/run/cryptsetup-keys.d/</filename> (see above) or in the LUKS2 JSON token header (in case of the latter three). Use the <citerefentry><refentrytitle>systemd-cryptenroll</refentrytitle><manvolnum>1</manvolnum></citerefentry> @@ -956,7 +956,7 @@ is acquired by connecting to the socket and reading the key from the connection. The connection is made from an <constant>AF_UNIX</constant> socket name in the abstract namespace, see <citerefentry project='man-pages'><refentrytitle>unix</refentrytitle><manvolnum>7</manvolnum></citerefentry> for - details. The source socket name is chosen according the following format:</para> + details. The source socket name is chosen according to the following format:</para> <programlisting><constant>NUL</constant> <replaceable>RANDOM</replaceable> /cryptsetup/ <replaceable>VOLUME</replaceable></programlisting> diff --git a/man/repart.d.xml b/man/repart.d.xml index 50a2de7c33..fb32e2dc46 100644 --- a/man/repart.d.xml +++ b/man/repart.d.xml @@ -383,7 +383,7 @@ <para>The file specified here must have a size that is a multiple of the basic block size 512 and not be empty. If this option is used, the size allocation algorithm is slightly altered: the partition is - created as least as big as required to fit the data in, i.e. the data size is an additional minimum + created at least as big as required to fit the data in, i.e. the data size is an additional minimum size value taken into consideration for the allocation algorithm, similar to and in addition to the <varname>SizeMin=</varname> value configured above.</para> @@ -407,7 +407,7 @@ <literal>squashfs</literal> or the special value <literal>swap</literal>. If specified and the partition is newly created it is formatted with the specified file system (or as swap device). The file system UUID and label are automatically derived from the partition UUID and label. If this option is used, - the size allocation algorithm is slightly altered: the partition is created as least as big as + the size allocation algorithm is slightly altered: the partition is created at least as big as required for the minimal file system of the specified type (or 4KiB if the minimal size is not known).</para> |