hwdb: revert hwdb.bin back to /etc/udev

> Kay:
udev is early boot without /var. /var is entirely taboo for udev.

This partially reverts commit ee623f0d0c04a9c8da4953ddc29862c8c4945458
(moving hwdb.bin is reverted, but the uninstall hook and cosmetic
changes remain).

diff --git a/Makefile.am b/Makefile.am
index 1f30ba8cb86b5ae34280a9f28ef089c7c6551de6..d08eea2e58eb1bb6e798aa0c6fdb5509a2c46509 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,8 +65,7 @@ sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
 varlogdir=$(localstatedir)/log
 systemdstatedir=$(localstatedir)/lib/systemd
 catalogstatedir=$(systemdstatedir)/catalog
 varlogdir=$(localstatedir)/log
 systemdstatedir=$(localstatedir)/lib/systemd
 catalogstatedir=$(systemdstatedir)/catalog

-udevstatedir=$(localstatedir)/lib/udev
-hwdb_bin=$(udevstatedir)/hwdb.bin
+hwdb_bin=/etc/udev/hwdb.bin

 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd

diff --git a/man/udevadm.xml b/man/udevadm.xml
index 43d2f5bcf609b90b799d34cc0e2590fdedbc186b..3bd7738fba500add98dd1117269413e06cd63299 100644 (file)
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -424,13 +424,13 @@
     </refsect2>
 
     <refsect2><title>udevadm hwdb <optional>options</optional></title>
     </refsect2>
 
     <refsect2><title>udevadm hwdb <optional>options</optional></title>

-      <para>Maintain the hardware database index in <filename>$(localstatedir)/lib/udev/hwdb.bin</filename>.</para>
+      <para>Maintain the hardware database index in <filename>/etc/udev/hwdb.bin</filename>.</para>

       <variablelist>
         <varlistentry>
           <term><option>--update</option></term>
           <listitem>
             <para>Compile the hardware dabase information located in /usr/lib/udev/hwdb.d/,
       <variablelist>
         <varlistentry>
           <term><option>--update</option></term>
           <listitem>
             <para>Compile the hardware dabase information located in /usr/lib/udev/hwdb.d/,

-            /etc/udev/hwdb.d/ and store it in <filename>$(localstatedir)/lib/udev/hwdb.bin</filename>. This should be done with
+            /etc/udev/hwdb.d/ and store it in <filename>/etc/udev/hwdb.bin</filename>. This should be done with

             any update to the source files, it will not be called automatically. The running
             udev daemon will detect a new database on its own and does not need to be
             notified about it.</para>
             any update to the source files, it will not be called automatically. The running
             udev daemon will detect a new database on its own and does not need to be
             notified about it.</para>