summaryrefslogtreecommitdiff
path: root/man/udev.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/udev.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/udev.xml')
-rw-r--r--man/udev.xml13
1 files changed, 5 insertions, 8 deletions
diff --git a/man/udev.xml b/man/udev.xml
index 70f4f59c08..4c2e13ee7b 100644
--- a/man/udev.xml
+++ b/man/udev.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="udev">
<refentryinfo>
@@ -58,17 +55,17 @@
<refsect1><title>Rules Files</title>
<para>The udev rules are read from the files located in the
- system rules directory <filename>&udevlibexecdir;/rules.d</filename>,
+ system rules directory <filename>/usr/lib/udev/rules.d</filename>,
the volatile runtime directory <filename>/run/udev/rules.d</filename>
and the local administration directory <filename>/etc/udev/rules.d</filename>.
All rules 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
+ over files with the same name in <filename>/usr/lib</filename>. This can be
used to override a system-supplied rules file with a local file if needed;
a symlink in <filename>/etc</filename> with the same name as a rules file in
- <filename>&rootprefix;/lib</filename>, pointing to <filename>/dev/null</filename>,
+ <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
disables the rules file entirely. Rule files must have the extension
<filename>.rules</filename>; other extensions are ignored.</para>
@@ -424,7 +421,7 @@
<listitem>
<para>Execute an external program specified as the assigned
value. If no absolute path is given, the program is expected
- to live in <filename>&udevlibexecdir;</filename>; otherwise, the
+ to live in <filename>/usr/lib/udev</filename>; otherwise, the
absolute path must be specified.</para>
<para>This is the default if no <replaceable>type</replaceable>
is specified.</para>