summaryrefslogtreecommitdiff
path: root/man/hwdb.xml
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-06-18 19:47:44 +0200
committerTom Gundersen <teg@jklm.no>2015-06-18 19:47:44 +0200
commit12b42c76672a66c2d4ea7212c14f8f1b5a62b78d (patch)
tree0a9f5aff7fc2f144765f936c618c563568edba1f /man/hwdb.xml
parent74b1f5276365bbdf02dacec707fb9c40509650b4 (diff)
man: revert dynamic paths for split-usr setups
This did not really work out as we had hoped. Trying to do this upstream introduced several problems that probably makes it better suited as a downstream patch after all. At any rate, it is not releaseable in the current state, so we at least need to revert this before the release. * by adjusting the path to binaries, but not do the same thing to the search path we end up with inconsistent man-pages. Adjusting the search path too would be quite messy, and it is not at all obvious that this is worth the effort, but at any rate it would have to be done before we could ship this. * this means that distributed man-pages does not make sense as they depend on config options, and for better or worse we are still distributing man pages, so that is something that definitely needs sorting out before we could ship with this patch. * we have long held that split-usr is only minimally supported in order to boot, and something we hope will eventually go away. So before we start adding even more magic/effort in order to make this work nicely, we should probably question if it makes sense at all.
Diffstat (limited to 'man/hwdb.xml')
-rw-r--r--man/hwdb.xml18
1 files changed, 8 insertions, 10 deletions
diff --git a/man/hwdb.xml b/man/hwdb.xml
index 8a6e26d089..80939dd95d 100644
--- a/man/hwdb.xml
+++ b/man/hwdb.xml
@@ -1,9 +1,6 @@
<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
<!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">
<refentry id="hwdb" conditional="ENABLE_HWDB">
<refentryinfo>
@@ -43,15 +40,16 @@
<refsect1><title>Hardware Database Files</title>
<para>The hwdb files are read from the files located in the
- system hwdb directory <filename>&udevlibexecdir;/hwdb.d</filename>
- and the local administration directory <filename>/etc/udev/hwdb.d</filename>.
+ system hwdb directory <filename>/usr/lib/udev/hwdb.d</filename> and
+ the local administration directory <filename>/etc/udev/hwdb.d</filename>.
All hwdb 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>
- take precedence over files with the same name in <filename>&rootprefix;/lib</filename>.
- This can be used to override a system-supplied hwdb file with a local file if needed;
+ have the highest priority and take precedence over files with the same
+ name in <filename>/usr/lib</filename>. This can be used to override a
+ system-supplied hwdb file with a local file if needed;
a symlink in <filename>/etc</filename> with the same name as a hwdb file in
- <filename>&rootprefix;/lib</filename>, pointing to <filename>/dev/null</filename>,
+ <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
disables the hwdb file entirely. hwdb files must have the extension
<filename>.hwdb</filename>; other extensions are ignored.</para>
@@ -71,7 +69,7 @@
<para>The content of all hwdb files is read by
<citerefentry><refentrytitle>systemd-hwdb</refentrytitle><manvolnum>8</manvolnum></citerefentry>
and compiled to a binary database located at <filename>/etc/udev/hwdb.bin</filename>,
- or alternatively <filename>&udevlibexecdir;/hwdb.bin</filename> if you want ship the compiled
+ or alternatively <filename>/usr/lib/udev/hwdb.bin</filename> if you want ship the compiled
database in an immutable image.
During runtime only the binary database is used.</para>
</refsect1>