diff options
Diffstat (limited to 'man/systemd-sleep.conf.5')
| -rw-r--r-- | man/systemd-sleep.conf.5 | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/man/systemd-sleep.conf.5 b/man/systemd-sleep.conf.5 index b7aec9e112..dc906afdee 100644 --- a/man/systemd-sleep.conf.5 +++ b/man/systemd-sleep.conf.5 @@ -1,5 +1,5 @@ '\" t -.TH "SYSTEMD\-SLEEP\&.CONF" "5" "" "systemd 219" "systemd-sleep.conf" +.TH "SYSTEMD\-SLEEP\&.CONF" "5" "" "systemd 220" "systemd-sleep.conf" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -61,33 +61,21 @@ when attempts to suspend or hibernate the machine\&. .SH "CONFIGURATION DIRECTORIES AND PRECEDENCE" .PP -Configuration files are read from directories in -/etc/, -/run/, and -/usr/lib/, in order of precedence\&. Each configuration file in these configuration directories shall be named in the style of -\fIfilename\fR\&.conf\&. Files in -/etc/ -override files with the same name in -/run/ -and -/usr/lib/\&. Files in -/run/ -override files with the same name in -/usr/lib/\&. +Default configuration is defined during compilation, so a configuration file is only needed when it is necessary to deviate from those defaults\&. By default the configuration file in +/etc/systemd/ +contains commented out entries showing the defaults as a guide to the administrator\&. This file can be edited to create local overrides\&. .PP -Packages should install their configuration files in -/usr/lib/\&. Files in +When packages need to customize the configuration, they can install configuration snippets in +/usr/lib/systemd/*\&.conf\&.d/\&. Files in /etc/ -are reserved for the local administrator, who may use this logic to override the configuration files installed by vendor packages\&. All configuration files are sorted by their filename in lexicographic order, regardless of which of the directories they reside in\&. If multiple files specify the same option, the entry in the file with the lexicographically latest name will take precedence\&. 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\&. The main configuration file is read before any of the configuration directories, and has the lowest precedence; entries in a file in any configuration directory override entries in the single configuration file\&. Files in the +*\&.conf\&.d/ +configuration subdirectories are sorted by their filename in lexicographic order, regardless of which of the subdirectories they reside in\&. If multiple files specify the same option, the entry in the file with the lexicographically latest name takes 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\&. .PP -If the administrator wants to disable a configuration file supplied by the vendor, the recommended way is to place a symlink to +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 /etc/, with the same filename as the vendor configuration file\&. -.SH "CONFIGURATION FILE" -.PP -Configuration is also read from a single configuration file in -/etc/\&. This file is read before any of the configuration directories, and has the lowest precedence; entries in a file in any configuration directory override entries in the single configuration file\&. .SH "OPTIONS" .PP The following options can be configured in the |