diff options
author | Kay Sievers <kay@vrfy.org> | 2015-06-18 22:27:50 +0200 |
---|---|---|
committer | Kay Sievers <kay@vrfy.org> | 2015-06-18 22:27:50 +0200 |
commit | 6433d440729d22f5954ea1bf9c828bbad04e0838 (patch) | |
tree | 2c99d171a99820d08bc2618cf7a17d60e573abc9 /man/systemd.link.xml | |
parent | 38489ef8b2998e2015de629d80932ffcb6a2e78c (diff) | |
parent | 12b42c76672a66c2d4ea7212c14f8f1b5a62b78d (diff) |
Merge pull request #293 from teg/man-revert
man: revert dynamic paths for split-usr setups
Diffstat (limited to 'man/systemd.link.xml')
-rw-r--r-- | man/systemd.link.xml | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/man/systemd.link.xml b/man/systemd.link.xml index 723364f4d1..d9b1879c59 100644 --- a/man/systemd.link.xml +++ b/man/systemd.link.xml @@ -1,9 +1,6 @@ <?xml version='1.0'?> <!--*-nxml-*--> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -<!ENTITY % entities SYSTEM "custom-entities.ent" > -%entities; -]> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <!-- This file is part of systemd. @@ -59,21 +56,21 @@ <command>net_setup_link</command> udev builtin.</para> <para>The link files are read from the files located in the system - network directory <filename>&rootlibexecdir;/network</filename>, + network directory <filename>/usr/lib/systemd/network</filename>, the volatile runtime network directory <filename>/run/systemd/network</filename>, and the local administration network directory - <filename>&pkgsysconfdir;/network</filename>. Link files must have + <filename>/etc/systemd/network</filename>. Link files must have the extension <filename>.link</filename>; other extensions are ignored. All link files are collectively sorted and processed in lexical order, regardless of the directories in which they live. However, files with identical filenames replace each other. Files in <filename>/etc</filename> have the highest priority, files in <filename>/run</filename> take precedence over files with the same - name in <filename>&rootprefix;/lib</filename>. This can be used to + name in <filename>/usr/lib</filename>. This can be used to override a system-supplied link file with a local file if needed; a symlink in <filename>/etc</filename> with the same name as a - link file in <filename>&rootprefix;/lib</filename>, pointing to + link file in <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>, disables the link file entirely.</para> @@ -387,7 +384,7 @@ <refsect1> <title>Example</title> <example> - <title>&pkgsysconfdir;/network/wireless.link</title> + <title>/etc/systemd/network/wireless.link</title> <programlisting>[Match] MACAddress=12:34:56:78:9a:bc |