From 1e1954f53386cb773e2a152748dd31c4d36aa2d8 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Sat, 17 Nov 2012 01:48:06 +0100 Subject: 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). --- Makefile.am | 3 +-- 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 @@ udevadm hwdb <optional>options</optional> - Maintain the hardware database index in $(localstatedir)/lib/udev/hwdb.bin. + Maintain the hardware database index in /etc/udev/hwdb.bin. Compile the hardware dabase information located in /usr/lib/udev/hwdb.d/, - /etc/udev/hwdb.d/ and store it in $(localstatedir)/lib/udev/hwdb.bin. This should be done with + /etc/udev/hwdb.d/ and store it in /etc/udev/hwdb.bin. 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. -- cgit v1.2.3-54-g00ecf