diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2014-11-29 01:05:43 -0800 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-11-29 13:55:31 -0500 |
| commit | d3fae78fe86f1dfcdb07fd613ccbb3adf547a617 (patch) | |
| tree | 5d69302bf78d904cc5c8e90d21ae76be175ca10d /man/modules-load.d.xml | |
| parent | 02b75c9edd61f47de7940b61b97b071b69f38a11 (diff) | |
| download | systemd-d3fae78fe86f1dfcdb07fd613ccbb3adf547a617.tar.gz | |
man: Factor out a common snippet for .d directories and precedence
Several manpages contain duplicate text describing a standard set of .d
configuration directories, with the usual sorting, precedence,
overrides, and so on. Factor this common text out using XInclude before
proliferating it even further.
Diffstat (limited to 'man/modules-load.d.xml')
| -rw-r--r-- | man/modules-load.d.xml | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml index 33c466f926..4b578d714c 100644 --- a/man/modules-load.d.xml +++ b/man/modules-load.d.xml @@ -19,7 +19,8 @@ You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see <http://www.gnu.org/licenses/>. --> -<refentry id="modules-load.d" conditional='HAVE_KMOD'> +<refentry id="modules-load.d" conditional='HAVE_KMOD' + xmlns:xi="http://www.w3.org/2001/XInclude"> <refentryinfo> <title>modules-load.d</title> @@ -74,29 +75,10 @@ list of kernel module names to load, separated by newlines. Empty lines and lines whose first non-whitespace character is # or ; are ignored.</para> - - <para>Each configuration file shall be named in the - style of <filename><replaceable>program</replaceable>.conf</filename>. - Files in <filename>/etc/</filename> override files - with the same name in <filename>/usr/lib/</filename> - and <filename>/run/</filename>. Files in - <filename>/run/</filename> override files with the - same name in <filename>/usr/lib/</filename>. Packages - should install their configuration files in - <filename>/usr/lib/</filename>, files in - <filename>/etc/</filename> are reserved for the local - administrator, who may use this logic to override the - configuration files installed from vendor - packages.</para> - - <para>If the administrator wants to disable a - configuration file supplied by the vendor, the - recommended way is to place a symlink to - <filename>/dev/null</filename> in - <filename>/etc/modules-load.d/</filename> bearing the - same filename.</para> </refsect1> + <xi:include href="standard-conf.xml" xpointer="confd" /> + <refsect1> <title>Example</title> <example> |