diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-11-17 01:48:06 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-11-17 01:55:35 +0100 |
| commit | 1e1954f53386cb773e2a152748dd31c4d36aa2d8 (patch) | |
| tree | ca8ca11484aecafb8c114ecd0b5b64faefcc8cab | |
| parent | 5190bbb240ab3360f7d37714d1c877858aef8c12 (diff) | |
| download | systemd-1e1954f53386cb773e2a152748dd31c4d36aa2d8.tar.gz | |
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).
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | man/udevadm.xml | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 1f30ba8cb8..d08eea2e58 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,8 +65,7 @@ sysvinitdir=$(SYSTEM_SYSVINIT_PATH) 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 diff --git a/man/udevadm.xml b/man/udevadm.xml index 43d2f5bcf6..3bd7738fba 100644 --- a/man/udevadm.xml +++ b/man/udevadm.xml @@ -424,13 +424,13 @@ </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/, - /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> |