From 12a362be5c1982f80dbfb75bda070208a2c99cdf Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 1 Dec 2011 12:17:22 +0100
Subject: use libexecdir, bindir, sbindir, switch to /usr/lib/udev in
 documentation

---
 udev/udev-event.c |  2 +-
 udev/udev-rules.c |  6 +++---
 udev/udev.xml     | 14 +++++++-------
 udev/udevd.xml    |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'udev')

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 7db7513247..1ea39967fc 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -765,7 +765,7 @@ int udev_event_spawn(struct udev_event *event,
 		}
 	}
 
-	/* allow programs in /lib/udev/ to be called without the path */
+	/* allow programs in /usr/lib/udev/ to be called without the path */
 	if (argv[0][0] != '/') {
 		util_strscpyl(program, sizeof(program), LIBEXECDIR "/", argv[0], NULL);
 		argv[0] = program;
diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index f540a5ae7b..f3e248eb4f 100644
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1798,13 +1798,13 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 	if (udev_get_rules_path(udev) == NULL) {
 		char filename[UTIL_PATH_SIZE];
 
-		/* /lib/udev -- default/package rules */
+		/* /usr/lib/udev -- system rules */
 		add_matching_files(udev, &file_list, LIBEXECDIR "/rules.d", ".rules");
 
-		/* /etc/udev -- system-specific/user/admin rules */
+		/* /etc/udev -- local administration rules */
 		add_matching_files(udev, &file_list, SYSCONFDIR "/udev/rules.d", ".rules");
 
-		/* /run/udev -- throw-away/temporary rules */
+		/* /run/udev -- runtime rules */
 		util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL);
 		add_matching_files(udev, &file_list, filename, ".rules");
 	} else {
diff --git a/udev/udev.xml b/udev/udev.xml
index ab82012cee..7b31173b21 100644
--- a/udev/udev.xml
+++ b/udev/udev.xml
@@ -41,8 +41,8 @@
   </refsect1>
 
   <refsect1><title>Configuration</title>
-    <para>udev configuration files are placed in <filename>/etc/udev/</filename>
-    and <filename>/lib/udev/</filename>. All empty lines or lines beginning with
+    <para>udev configuration files are placed in <filename>/etc/udev</filename>
+    and <filename>/usr/lib/udev</filename>. All empty lines or lines beginning with
     '#' are ignored.</para>
 
     <refsect2><title>Configuration file</title>
@@ -71,9 +71,9 @@
 
     <refsect2><title>Rules files</title>
       <para>The udev rules are read from the files located in the
-      system rules directory <filename>/lib/udev/rules.d/</filename>,
-      the local administration directory <filename>/etc/udev/rules.d/</filename>
-      and the volatile runtime directory <filename>/run/udev/rules.d/</filename>.
+      system rules directory <filename>/usr/lib/udev/rules.d</filename>,
+      the local administration directory <filename>/etc/udev/rules.d</filename>
+      and the volatile runtime directory <filename>/run/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 file names replace each other. Files in <filename>/run</filename>
@@ -398,7 +398,7 @@
             detached from the event process itself.</para>
             <para>If no absolute path is given, the program is expected to live in
             the directory provided at compile-time to configure via --libexecdir
-            (this is usually <filename>/lib/udev</filename>), otherwise the absolute
+            (this is usually <filename>/usr/lib/udev</filename>), otherwise the absolute
             path must be specified. The program name and following arguments are
             separated by spaces. Single quotes can be used to specify arguments with
             spaces.</para>
@@ -511,7 +511,7 @@
                 <listitem>
                   <para>Apply the permissions specified in this rule to the static device node with
                   the specified name. Static device nodes might be provided by kernel modules
-                  or copied from <filename>/lib/udev/devices</filename>. These nodes might not have
+                  or copied from <filename>/usr/lib/udev/devices</filename>. These nodes might not have
                   a corresponding kernel device at the time udevd is started; they can trigger
                   automatic kernel module loading.</para>
                 </listitem>
diff --git a/udev/udevd.xml b/udev/udevd.xml
index d335e2ec88..c516eb9793 100644
--- a/udev/udevd.xml
+++ b/udev/udevd.xml
@@ -37,7 +37,7 @@
     instructions specified in udev rules. See <citerefentry>
         <refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum>
       </citerefentry>.</para>
-    <para>On startup the content of the directory <filename>/lib/udev/devices</filename>
+    <para>On startup the content of the directory <filename>/usr/lib/udev/devices</filename>
     is copied to <filename>/dev</filename>. If kernel modules specify static device
     nodes, these nodes are created even without a corresponding kernel device, to
     allow on-demand loading of kernel modules. Matching permissions specified in udev
-- 
cgit v1.2.3-54-g00ecf