Commit 9e81e2e3 authored by Michael Biebl's avatar Michael Biebl
Browse files

Fix incorrect paths in man pages

LP: #1357782
Closes: #717491
parent e7ab0fc6
......@@ -4,7 +4,6 @@ systemd (215-3) UNRELEASED; urgency=medium
* 75-persistent-net-generator.rules: Fix matches of HyperV. (LP: #1361272)
[ Martin Pitt ]
* Fix udev path in udev(7). (LP: #1357782)
* 75-persistent-net-generator.rules: Add new MS Azure MAC prefix 00:25:ae.
(LP: #1367883)
......@@ -13,6 +12,7 @@ systemd (215-3) UNRELEASED; urgency=medium
* The /dev/log socket and /dev/initctl FIFO have been moved to /run and
replaced by symlinks. Create the symlinks manually on upgrades as well.
(Closes: #761340)
* Fix incorrect paths in man pages. (LP: #1357782, Closes: #717491)
-- Martin Pitt <mpitt@debian.org> Mon, 08 Sep 2014 12:58:27 +0200
......
This diff is collapsed.
From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Mon, 8 Sep 2014 12:56:41 +0200
Subject: Fix udev directory in udev(7)
We still put udev into /lib/udev/, not into /usr/lib/udev/.
LP: #1357782
---
man/udev.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/man/udev.xml b/man/udev.xml
index 4e5f8f0..a1d1ae3 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -56,17 +56,17 @@
<refsect1><title>Rules Files</title>
<para>The udev rules are read from the files located in the
- system rules directory <filename>/usr/lib/udev/rules.d</filename>,
+ system rules directory <filename>/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>/usr/lib</filename>. This can be
+ over files with the same name in <filename>/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>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
+ <filename>/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>
@@ -395,7 +395,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>/usr/lib/udev</filename>; otherwise, the
+ to live in <filename>/lib/udev</filename>; otherwise, the
absolute path must be specified.</para>
<para>This is the default if no <replaceable>type</replaceable>
is specified.</para>
@@ -729,17 +729,17 @@
<refsect1><title>Hardware Database Files</title>
<para>The hwdb files are read from the files located in the
- system hwdb directory <filename>/usr/lib/udev/hwdb.d</filename>,
+ system hwdb directory <filename>/lib/udev/hwdb.d</filename>,
the volatile runtime directory <filename>/run/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>
have the highest priority, files in <filename>/run</filename> take precedence
- over files with the same name in <filename>/usr/lib</filename>. This can be
+ over files with the same name in <filename>/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>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
+ <filename>/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>
......@@ -150,4 +150,4 @@ Make-emergency.service-conflict-with-rescue.service.patch
Stop-syslog.socket-when-entering-emergency-mode.patch
Make-run-lock-tmpfs-an-API-fs.patch
Include-additional-directories-in-ProtectSystem.patch
Fix-udev-directory-in-udev-7.patch
Fix-paths-in-man-pages.patch
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment