X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-delta.xml;h=2175f96550715f16ee7c452bc44bb33a1d31b92c;hb=820aced6f6067a6b7c57b7d36e44f64378870cbf;hp=03c7178d47d97c039ef7baa74e202c69e8c6e6ba;hpb=807f46452202891731b2317ef9bc9a6bc7115f23;p=elogind.git
diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml
index 03c7178d4..2175f9655 100644
--- a/man/systemd-delta.xml
+++ b/man/systemd-delta.xml
@@ -21,7 +21,8 @@
along with systemd; If not, see .
-->
-
+systemd-delta
@@ -49,7 +50,9 @@
- systemd-delta OPTIONSSUFFIX
+ systemd-delta
+ OPTIONS
+ PREFIX/SUFFIX|SUFFIX
@@ -57,18 +60,46 @@
Descriptionsystemd-delta may be used to
- identify and compare configuration files in
- /etc that override default
- counterparts in /usr. The command
- line argument can be one or more name of a subdirectories of
- /etc or
- /usr/lib to compare, such as
- tmpfiles.d, sysctl.d or
- systemd/system.
-
- When no argument is specified a number of
- well-known subdirectories are searched for overriden
- files.
+ identify and compare configuration files that override
+ other configuration files. Files in
+ /etc have highest priority, files
+ in /run have the second highest
+ priority, ..., files in /lib have
+ lowest priority. Files in a directory with higher
+ priority override files with the same name in
+ directories of lower priority. In addition, certain
+ configuration files can have .d
+ directories which contain "drop-in" files with
+ configuration snippets which augment the main
+ configuration file. "Drop-in" files can be overriden
+ in the same way by placing files with the same name in
+ a directory of higher priority (except that in case of
+ "drop-in" files, both the "drop-in" file name and the
+ name of the containing directory, which corresponds to
+ the name of the main configuration file, must match).
+ For a fuller explanation, see
+ systemd.unit5.
+
+
+ The command line argument will be split into a
+ prefix and a suffix. Either is optional. The prefix
+ must be one of the directories containing
+ configuration files (/etc,
+ /run,
+ /usr/lib, ...). If it is given,
+ only overriding files contained in this directory will
+ be shown. Otherwise, all overriding files will be
+ shown. The suffix must be a name of a subdirectory
+ containing configuration files like
+ tmpfiles.d,
+ sysctl.d or
+ systemd/system. If it is given,
+ only configuration files in this subdirectory (across
+ all configuration paths) will be analyzed. Otherwise,
+ all configuration files will be analyzed. If the
+ command line argument is not given at all, all
+ configuration files will be analyzed. See below for
+ some examples.
@@ -78,30 +109,8 @@
-
-
-
- Prints a short help
- text and exits.
-
-
-
-
-
- Prints a short version
- string and exits.
-
-
-
-
-
- Do not pipe output into a
- pager.
-
-
-
-
+ When listing the
differences, only list those that are
@@ -109,7 +118,7 @@
comma-separated list of desired
difference types.
- Recognised types are:
+ Recognized types are:
@@ -121,8 +130,8 @@
equivalent
- Show overriden
- files that while overriden, do
+ Show overridden
+ files that while overridden, do
not differ in content.
@@ -134,12 +143,19 @@
- overriden
+ overridden
- Show overriden,
+ Show overridden,
and changed files.
+
+ extended
+
+ Show *.conf files in drop-in
+ directories for units.
+
+
unchanged
@@ -154,26 +170,46 @@
When showing modified
- files, when a file is overriden show a
- diff aswell. This option takes a
- boolean argument.
+ files, when a file is overridden show a
+ diff as well. This option takes a
+ boolean argument. If omitted, it defaults
+ to .
+
+
+
+
+
+
+ Examples
+
+ To see all local configuration:
+ systemd-delta
+
+ To see all runtime configuration:
+ systemd-delta /run
+
+ To see all system unit configuration changes:
+ systemd-delta systemd/system
+ To see all runtime "drop-in" changes for system units:
+ systemd-delta --type=extended /run/systemd/systemExit status
- On success 0 is returned, a non-zero failure
+ On success, 0 is returned, a non-zero failure
code otherwise.See Also
- systemd1
+ systemd1,
+ systemd.unit5