|
231 | 231 | <varlistentry> |
232 | 232 | <term><varname>RootHashSignature=</varname></term> |
233 | 233 |
|
234 | | - <listitem><para>Takes a PKCS7 formatted binary signature of the <varname>RootHash=</varname> option as a path |
235 | | - to a DER encoded signature file or as an ASCII base64 string encoding of the DER encoded signature, prefixed |
236 | | - by <literal>base64:</literal>. The dm-verity volume will only be opened if the signature of the root hash |
237 | | - signature is valid and created by a public key present in the kernel keyring. If this option is not specified, |
238 | | - but a file with the <filename>.roothash.p7s</filename> suffix is found next to the image file, bearing otherwise |
239 | | - the same name (except if the image has the <filename>.raw</filename> suffix, in which case the signature file |
240 | | - must not have it in its name), the signature is read from it and automatically used.</para> |
| 234 | + <listitem><para>Takes a PKCS7 signature of the <varname>RootHash=</varname> option as a path to a |
| 235 | + DER-encoded signature file, or as an ASCII base64 string encoding of a DER-encoded signature prefixed |
| 236 | + by <literal>base64:</literal>. The dm-verity volume will only be opened if the signature of the root |
| 237 | + hash is valid and signed by a public key present in the kernel keyring. If this option is not |
| 238 | + specified, but a file with the <filename>.roothash.p7s</filename> suffix is found next to the image |
| 239 | + file, bearing otherwise the same name (except if the image has the <filename>.raw</filename> suffix, |
| 240 | + in which case the signature file must not have it in its name), the signature is read from it and |
| 241 | + automatically used.</para> |
241 | 242 |
|
242 | 243 | <para>If the disk image contains a separate <filename>/usr/</filename> partition it may also be |
243 | 244 | Verity protected, in which case the signature for the root hash may configured via a |
@@ -681,7 +682,7 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting> |
681 | 682 | <listitem><para>Takes a profile name as argument. The process executed by the unit will switch to |
682 | 683 | this profile when started. Profiles must already be loaded in the kernel, or the unit will fail. If |
683 | 684 | prefixed by <literal>-</literal>, all errors will be ignored. This setting has no effect if AppArmor |
684 | | - is not enabled. This setting not affect commands prefixed with <literal>+</literal>.</para> |
| 685 | + is not enabled. This setting does not affect commands prefixed with <literal>+</literal>.</para> |
685 | 686 | </listitem> |
686 | 687 | </varlistentry> |
687 | 688 |
|
@@ -1169,12 +1170,12 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting> |
1169 | 1170 | <term><varname>LogsDirectory=</varname></term> |
1170 | 1171 | <term><varname>ConfigurationDirectory=</varname></term> |
1171 | 1172 |
|
1172 | | - <listitem><para>These options take a whitespace-separated list of directory names. The specified directory |
1173 | | - names must be relative, and may not include <literal>..</literal>. If set, one or more |
1174 | | - directories by the specified names will be created (including their parents) below the locations |
1175 | | - defined in the following table, when the unit is started. Also, the corresponding environment variable |
1176 | | - is defined with the full path of directories. If multiple directories are set, then in the environment variable |
1177 | | - the paths are concatenated with colon (<literal>:</literal>).</para> |
| 1173 | + <listitem><para>These options take a whitespace-separated list of directory names. The specified |
| 1174 | + directory names must be relative, and may not include <literal>..</literal>. If set, when the unit is |
| 1175 | + started, one or more directories by the specified names will be created (including their parents) |
| 1176 | + below the locations defined in the following table. Also, the corresponding environment variable will |
| 1177 | + be defined with the full paths of the directories. If multiple directories are set, then in the |
| 1178 | + environment variable the paths are concatenated with colon (<literal>:</literal>).</para> |
1178 | 1179 | <table> |
1179 | 1180 | <title>Automatic directory creation and environment variables</title> |
1180 | 1181 | <tgroup cols='4'> |
@@ -1336,10 +1337,10 @@ StateDirectory=aaa/bbb ccc</programlisting> |
1336 | 1337 | <term><varname>ReadOnlyPaths=</varname></term> |
1337 | 1338 | <term><varname>InaccessiblePaths=</varname></term> |
1338 | 1339 |
|
1339 | | - <listitem><para>Sets up a new file system namespace for executed processes. These options may be used to limit |
1340 | | - access a process might have to the file system hierarchy. Each setting takes a space-separated list of paths |
1341 | | - relative to the host's root directory (i.e. the system running the service manager). Note that if paths |
1342 | | - contain symlinks, they are resolved relative to the root directory set with |
| 1340 | + <listitem><para>Sets up a new file system namespace for executed processes. These options may be used |
| 1341 | + to limit access a process has to the file system. Each setting takes a space-separated list of paths |
| 1342 | + relative to the host's root directory (i.e. the system running the service manager). Note that if |
| 1343 | + paths contain symlinks, they are resolved relative to the root directory set with |
1343 | 1344 | <varname>RootDirectory=</varname>/<varname>RootImage=</varname>.</para> |
1344 | 1345 |
|
1345 | 1346 | <para>Paths listed in <varname>ReadWritePaths=</varname> are accessible from within the namespace |
@@ -2962,8 +2963,8 @@ StandardInputData=SWNrIHNpdHplIGRhIHVuJyBlc3NlIEtsb3BzLAp1ZmYgZWVtYWwga2xvcHAncy |
2962 | 2963 | <varlistentry> |
2963 | 2964 | <term><varname>$LOG_NAMESPACE</varname></term> |
2964 | 2965 |
|
2965 | | - <listitem><para>If the <varname>LogNamespace=</varname> service setting is used, contains name of the |
2966 | | - selected logging namespace.</para></listitem> |
| 2966 | + <listitem><para>Contains the name of the selected logging namespace when the |
| 2967 | + <varname>LogNamespace=</varname> service setting is used.</para></listitem> |
2967 | 2968 | </varlistentry> |
2968 | 2969 |
|
2969 | 2970 | <varlistentry> |
|
0 commit comments