X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-delta.xml;h=ebaa3492f4ab512061aa4696a097bdc550d40f57;hp=0e06b48fcc37d81e046bffcd71daa8564b4c7347;hb=89f7c8465cd1ab37347dd0c15920bce31e8225df;hpb=7e8d5761ecd4e8bc8f93b1f21861cac2a39a78a1 diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml index 0e06b48fc..ebaa3492f 100644 --- a/man/systemd-delta.xml +++ b/man/systemd-delta.xml @@ -49,7 +49,9 @@ - systemd-delta OPTIONS SUFFIX + systemd-delta + OPTIONS + PREFIX/SUFFIX|SUFFIX @@ -57,18 +59,46 @@ Description systemd-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 + commandline argument is not given at all, all + configuration files will be analyzed. See below for + some examples. @@ -95,25 +125,113 @@ - Do not pipe output into a - pager. - + Do not pipe output into a + pager. + - + + + + + When listing the + differences, only list those that are + asked for. The list itself is a + comma-separated list of desired + difference types. + + Recognized types are: + + + + masked + + Show masked files + + + + equivalent + + Show overridden + files that while overridden, do + not differ in content. + + + + redirected + + Show files that + are redirected to another. + + + + overridden + + Show overridden, + and changed files. + + + + extended + Show *.conf files in drop-in + directories for units. + + + + unchanged + + Show unmodified + files too. + + + + + + + + + When showing modified + 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/system + + + Exit 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