From: Zbigniew Jędrzejewski-Szmek Date: Sun, 24 Nov 2019 15:14:52 +0000 (+0100) Subject: man: refer to systemd.syntax(7) from systemd.nspawn(5) X-Git-Tag: v244~30^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6a5b75dbcc8d6b9a58023a2a15a19868158ef39e;p=thirdparty%2Fsystemd.git man: refer to systemd.syntax(7) from systemd.nspawn(5) systemd.nspawn(5) contained a partial repeat of the stuff that is now in the dedicated man page. Let's just refer to that. While at it, do s/searched/searched for/ where appropriate and reword some sentences for brevity. --- diff --git a/man/systemd.nspawn.xml b/man/systemd.nspawn.xml index 787d5fd699d..8f5590c73ad 100644 --- a/man/systemd.nspawn.xml +++ b/man/systemd.nspawn.xml @@ -32,58 +32,32 @@ Description - An nspawn container settings file (suffix - .nspawn) encodes additional runtime - information about a local container, and is searched, read and - used by - systemd-nspawn1 - when starting a container. Files of this type are named after the - containers they define settings for. They are optional, and only - required for containers whose execution environment shall differ - from the defaults. Files of this type mostly contain settings that - may also be set on the systemd-nspawn command - line, and make it easier to persistently attach specific settings - to specific containers. The syntax of these files is inspired by - .desktop files following the XDG - Desktop Entry Specification, which in turn are inspired by - Microsoft Windows .ini files. - - Boolean arguments used in these settings files can be - written in various formats. For positive settings, the strings - , , - and are equivalent. For negative settings, the - strings , , - and are - equivalent. - - Empty lines and lines starting with # or ; are - ignored. This may be used for commenting. Lines ending - in a backslash are concatenated with the following - line while reading and the backslash is replaced by a - space character. This may be used to wrap long lines. - + An nspawn container settings file (suffix .nspawn) contains runtime + configuration for a local container, and is used used by + systemd-nspawn1. + Files of this type are named after the containers they define settings for. They are optional, and only + required for containers whose execution environment shall differ from the defaults. Files of this type + mostly contain settings that may also be set on the systemd-nspawn command line, and + make it easier to persistently attach specific settings to specific containers. The syntax of these files + is inspired by .desktop files, similarly to other configuration files supported by + the systemd project. See + systemd.syntax7 for an + overview. <filename>.nspawn</filename> File Discovery - Files are searched by appending the - .nspawn suffix to the machine name of the - container, as specified with the - switch of systemd-nspawn, or derived from the - directory or image file name. This file is first searched in - /etc/systemd/nspawn/ and - /run/systemd/nspawn/. If found in these - directories, its settings are read and all of them take full effect - (but are possibly overridden by corresponding command line - arguments). If not found, the file will then be searched next to - the image file or in the immediate parent of the root directory of - the container. If the file is found there, only a subset of the - settings will take effect however. All settings that possibly - elevate privileges or grant additional access to resources of the - host (such as files or directories) are ignored. To which options - this applies is documented below. + Files are searched for by appending the .nspawn suffix to the machine name of + the container, as specified with the switch of + systemd-nspawn, or derived from the directory or image file name. This file is first + searched for in /etc/systemd/nspawn/ and + /run/systemd/nspawn/. If found there, the settings are read and all of them take + full effect (but may still be overridden by corresponding command line arguments). Otherwise, the file + will then be searched for next to the image file or in the immediate parent of the root directory of the + container. If the file is found there, only a subset of the settings will take effect however. All + settings that possibly elevate privileges or grant additional access to resources of the host (such as + files or directories) are ignored. To which options this applies is documented below. Persistent settings files created and maintained by the administrator (and thus trusted) should be placed in diff --git a/man/systemd.syntax.xml b/man/systemd.syntax.xml index 3b58e452803..05786cc534a 100644 --- a/man/systemd.syntax.xml +++ b/man/systemd.syntax.xml @@ -42,7 +42,9 @@ systemd.path5, systemd.timer5, systemd.slice5, - systemd.scope5 + systemd.scope5, + systemd.nspawn5 + daemon config files, see systemd-system.conf5,