summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-02-11 23:48:36 +0100
committerLennart Poettering <lennart@poettering.net>2013-02-11 23:54:30 +0100
commitfabe5c0e5fce730aa66e10a9c4f9fdd443d7aeda (patch)
tree11a1e012f820f3e4f30e5d60fd75f81dddaa1310 /man
parent853b8397acdebdd44777810e560403bae3756859 (diff)
binfmt,tmpfiles,modules-load,sysctl: rework the various early-boot services that work on .d/ directories
This unifies much of the logic behind them: - All four will now ofllow the rule that the earlier file and earlier assignment in the .d/ directories wins. Before, sysctl was the only outlier, where the later setting always won. - All four now support getopt() and --help on the command line. - All four can now handle specification of configuration file names on the command line to apply. The tools will automatically find them, and apply them. Previously only tmpfiles could do that. This is useful for %post scripts in RPMs and suchlike. - This fixes various error path issues in conf_files_list()
Diffstat (limited to 'man')
-rw-r--r--man/sysctl.d.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 69aac8cab7..0ef5545163 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -92,7 +92,7 @@
alphabetical order, regardless in which of the
directories they reside, to guarantee that a specific
configuration file takes precedence over another file
- with an alphabetically earlier name, if both files
+ with an alphabetically later name, if both files
contain the same variable setting.</para>
<para>If the administrator wants to disable a