diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2014-10-17 15:01:01 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2014-10-28 14:28:18 +0100 |
| commit | 33488f19793dc0a86fdee27266c5319b5b78d695 (patch) | |
| tree | bdadba036ac69b190d2ee2541c3f762da4698b66 /man | |
| parent | 2f952a25772a690eb03b6af2ad5998086a03234c (diff) | |
udev hwdb: Support shipping pre-compiled database in system images
In some cases it is preferable to ship system images with a pre-generated
binary hwdb database, to avoid having to build it at runtime, avoid shipping
the source hwdb files, or avoid storing large binary files in /etc.
So if hwdb.bin does not exist in /etc/udev/, fall back to looking for it in
UDEVLIBEXECDIR. This keeps the possibility to add files to /etc/udev/hwdb.d/
and re-generating the database which trumps the one in /usr/lib.
Add a new --usr flag to "udevadm hwdb --update" which puts the database
into UDEVLIBEXECDIR.
Adjust systemd-udev-hwdb-update.service to not generate the file in /etc if we
already have it in /usr.
Diffstat (limited to 'man')
| -rw-r--r-- | man/udev.xml | 4 | ||||
| -rw-r--r-- | man/udevadm.xml | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/man/udev.xml b/man/udev.xml index d77cbb0e6e..87c16c78ee 100644 --- a/man/udev.xml +++ b/man/udev.xml @@ -766,7 +766,9 @@ <para>The content of all hwdb files is read by <citerefentry><refentrytitle>udevadm</refentrytitle><manvolnum>8</manvolnum></citerefentry> - and compiled to a binary database located at <filename>/etc/udev/hwdb.bin</filename>. + and compiled to a binary database located at <filename>/etc/udev/hwdb.bin</filename>, + or alternatively <filename>/usr/lib/udev/hwdb.bin</filename> if you want ship the compiled + database in an immutable image. During runtime only the binary database is used.</para> </refsect1> diff --git a/man/udevadm.xml b/man/udevadm.xml index 749144dbd4..b85d9a9249 100644 --- a/man/udevadm.xml +++ b/man/udevadm.xml @@ -494,6 +494,15 @@ </listitem> </varlistentry> <varlistentry> + <term><option>--usr</option></term> + <listitem> + <para>Put the compiled database into <filename>/usr/lib/udev/hwdb.bin</filename> instead. + Use this if you want to ship a pre-compiled database in immutable system images, or + don't use <filename>/etc/udev/hwdb.d</filename> and want to avoid large binary files in + <filename>/etc</filename>.</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>-t</option></term> <term><option>--test=<replaceable>string</replaceable></option></term> <listitem> |