diff options
Diffstat (limited to 'upstream/fedora-rawhide/man5/environment.d.5')
| -rw-r--r-- | upstream/fedora-rawhide/man5/environment.d.5 | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/upstream/fedora-rawhide/man5/environment.d.5 b/upstream/fedora-rawhide/man5/environment.d.5 index 063bfb25..c54bd5c6 100644 --- a/upstream/fedora-rawhide/man5/environment.d.5 +++ b/upstream/fedora-rawhide/man5/environment.d.5 @@ -1,5 +1,5 @@ '\" t -.TH "ENVIRONMENT\&.D" "5" "" "systemd 255" "environment.d" +.TH "ENVIRONMENT\&.D" "5" "" "systemd 256~rc3" "environment.d" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -23,15 +23,21 @@ environment.d \- Definition of user service environment .SH "SYNOPSIS" .PP +.RS 4 ~/\&.config/environment\&.d/*\&.conf -.PP +.RE +.RS 4 /etc/environment\&.d/*\&.conf -.PP +.RE +.RS 4 /run/environment\&.d/*\&.conf -.PP +.RE +.RS 4 /usr/lib/environment\&.d/*\&.conf -.PP +.RE +.RS 4 /etc/environment +.RE .SH "DESCRIPTION" .PP Configuration files in the @@ -71,7 +77,12 @@ Packages should install their configuration files in /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\&. +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\&. .PP If the administrator wants to disable a configuration file supplied by the vendor, the recommended way is to place a symlink to /dev/null @@ -146,6 +157,4 @@ service builds an environment that is a combination of variables forwarded from or the underlying D\-Bus call\&. .SH "SEE ALSO" .PP -\fBsystemd\fR(1), -\fBsystemd-environment-d-generator\fR(8), -\fBsystemd.environment-generator\fR(7) +\fBsystemd\fR(1), \fBsystemd-environment-d-generator\fR(8), \fBsystemd.environment-generator\fR(7) |