diff --git a/man/standard-conf.xml b/man/standard-conf.xml index f54475f306..0ff71ece72 100644 --- a/man/standard-conf.xml +++ b/man/standard-conf.xml @@ -7,7 +7,7 @@ Copyright ยฉ 2014 Josh Triplett --> - + @@ -32,13 +32,16 @@ that is ordered later). Packages should install their configuration files in /usr/lib/ (distribution - packages) or /usr/local/lib/ (local installs). Files in /etc/ - are reserved for the local administrator, who may use this logic to override the configuration files - installed by vendor packages. It is recommended to prefix all filenames with a two-digit number and a - dash, to simplify the ordering of the files. It is recommended to use the range 10-40 for configuration - files in /usr/ and the range 60-90 for configuration files in - /etc/ and /run/, to make sure that local and transient - configuration files will always take priority over configuration files shipped by the OS vendor. + packages) or /usr/local/lib/ (local installs) + . + Files in /etc/ are reserved for the local administrator, who may use this logic to + override the configuration files installed by vendor packages. + + It is recommended to prefix all filenames with a two-digit number and a dash to simplify the + ordering. It is recommended to use the range 10-40 for configuration files in /usr/ + and the range 60-90 for configuration files in /etc/ and /run/, + to make sure that local and transient configuration files will always take priority over configuration + files shipped by the OS vendor. If the administrator wants to disable a configuration file supplied by the vendor, the recommended way is to place a symlink to /dev/null in the configuration directory in @@ -54,7 +57,7 @@ listed directories in order of priority, only the first file found is used: /etc/systemd/, /run/systemd/, - /usr/local/lib/systemd/, + /usr/local/lib/systemd/ , /usr/lib/systemd/. The vendor version of the file contains commented out entries showing the defaults as a guide to the administrator. Local overrides can also be created by creating drop-ins, as described below. The main @@ -76,10 +79,10 @@ who may use this logic to override the configuration files installed by vendor packages. Drop-ins have to be used to override package drop-ins, since the main configuration file has lower precedence. It is recommended to prefix all filenames in those subdirectories with a two-digit number and a dash, to - simplify the ordering of the files. This also defines a concept of drop-in priorities to allow - OS vendors to ship drop-ins within a specific range lower than the range used by users. This should - lower the risk of package drop-ins overriding accidentally drop-ins defined by users. It is recommended - to use the range 10-40 for drop-ins in /usr/ and the range 60-90 for drop-ins in + simplify the ordering. This also defines a concept of drop-in priorities to allow OS vendors to ship + drop-ins within a specific range lower than the range used by users. This should lower the risk of + package drop-ins overriding accidentally drop-ins defined by users. It is recommended to use the range + 10-40 for drop-ins in /usr/ and the range 60-90 for drop-ins in /etc/ and /run/, to make sure that local and transient drop-ins take priority over drop-ins shipped by the OS vendor. @@ -87,4 +90,17 @@ to /dev/null in the configuration directory in /etc/, with the same filename as the vendor configuration file. + + + Extras + + /usr/local/lib/systemd + + ๐Ÿ’ฃ๐Ÿ’ฅ๐Ÿงจ๐Ÿ’ฅ๐Ÿ’ฅ๐Ÿ’ฃ Please note that those configuration files must be available at all times. If + /usr/local/ is a separate partition, it may not be available during early boot, + and must not be used for configuration. + + + + diff --git a/man/systemd.environment-generator.xml b/man/systemd.environment-generator.xml index 79baffc871..98acbcb306 100644 --- a/man/systemd.environment-generator.xml +++ b/man/systemd.environment-generator.xml @@ -61,11 +61,12 @@ above. System and user environment generators are loaded from directories with names ending in system-environment-generators/ and user-environment-generators/, respectively. Generators found in directories - listed earlier override the ones with the same name in directories lower in the list. A symlink - to /dev/null or an empty file can be used to mask a generator, thereby - preventing it from running. Please note that the order of the two directories with the highest - priority is reversed with respect to the unit load path, and generators in - /run/ overwrite those in /etc/. + listed earlier override the ones with the same name in directories lower in the list + . + A symlink to /dev/null or an empty file can be used to mask a generator, + thereby preventing it from running. Please note that the order of the two directories with the highest + priority is reversed with respect to the unit load path, and generators in /run/ + overwrite those in /etc/. After installing new generators or updating the configuration, systemctl daemon-reload may be executed. This will re-run all generators, updating environment diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml index a7e7467e8b..ae4c2c5c0b 100644 --- a/man/systemd.generator.xml +++ b/man/systemd.generator.xml @@ -77,10 +77,11 @@ and user generators are loaded from directories with names ending in system-generators/ and user-generators/, respectively. Generators found in directories listed earlier override the ones with the same name in - directories lower in the list. A symlink to /dev/null or an empty file can be used - to mask a generator, thereby preventing it from running. Please note that the order of the two - directories with the highest priority is reversed with respect to the unit load path, and generators in - /run/ overwrite those in /etc/. + directories lower in the list . + A symlink to /dev/null or an empty file can be used to mask a generator, thereby + preventing it from running. Please note that the order of the two directories with the highest priority + is reversed with respect to the unit load path, and generators in /run/ overwrite + those in /etc/. After installing new generators or updating the configuration, systemctl daemon-reload may be executed. This will delete the previous configuration created by diff --git a/man/systemd.link.xml b/man/systemd.link.xml index 5d8c3251ef..3991d91881 100644 --- a/man/systemd.link.xml +++ b/man/systemd.link.xml @@ -35,7 +35,9 @@ The .link files are read from the files located in the system network directory /usr/lib/systemd/network and - /usr/local/lib/systemd/network, the volatile runtime network directory + /usr/local/lib/systemd/network + , + the volatile runtime network directory /run/systemd/network, and the local administration network directory /etc/systemd/network. All configuration files are collectively sorted and processed in alphanumeric order, regardless of the directories in which they live. However, files diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 22462312a8..b0efd62dbd 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -39,13 +39,14 @@ The .network files are read from the files located in the system network directories /usr/lib/systemd/network and - /usr/local/lib/systemd/network, the volatile runtime network directory - /run/systemd/network and the local administration network directory - /etc/systemd/network. All configuration files are collectively sorted and - processed in alphanumeric order, regardless of the directories in which they live. However, files - with identical filenames replace each other. It is recommended that each filename is prefixed with - a number smaller than 70 (e.g. 10-eth0.network). Otherwise, the - default .network files or those generated by + /usr/local/lib/systemd/network + , + the volatile runtime network directory /run/systemd/network and the local + administration network directory /etc/systemd/network. All configuration files are + collectively sorted and processed in alphanumeric order, regardless of the directories in which they + live. However, files with identical filenames replace each other. It is recommended that each filename is + prefixed with a number smaller than 70 (e.g. 10-eth0.network). + Otherwise, the default .network files or those generated by systemd-network-generator.service8 may take precedence over user configured files. Files in /etc/ have the highest priority, files in /run/ take precedence over files with the same name under diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 8bae335282..919e641c5c 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -353,7 +353,9 @@ Unit files are loaded from a set of paths determined during compilation, described in the two tables below. Unit files found in directories listed earlier override files with the same name in - directories lower in the list. + directories lower in the list + . + When the variable $SYSTEMD_UNIT_PATH is set, the contents of this variable overrides the unit load path. If @@ -407,7 +409,7 @@ /usr/local/lib/systemd/system - System units installed by the administrator + System units installed by the administrator /usr/lib/systemd/system @@ -2687,5 +2689,4 @@ OnFailure=failure-handler@%N.service uname1 -