From 218489052fdac57f3f2638f2655eba1679715e6a Mon Sep 17 00:00:00 2001 From: Boian Bonev Date: Sat, 30 Sep 2023 22:29:22 +0000 Subject: [PATCH] Improve wording and restore lines lost in merges Generate udev.7 from udev.xml --- man/udev.7 | 23 ++++++++++------------- man/udev.xml | 52 ++++++++++++++++++++++++++++------------------------ 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/man/udev.7 b/man/udev.7 index ada777c18..e3066ae26 100644 --- a/man/udev.7 +++ b/man/udev.7 @@ -23,9 +23,9 @@ udev \- Dynamic device management .SH "DESCRIPTION" .PP -udev supplies the system software with device events, manages permissions of device nodes and may create additional symlinks in the +udev supplies the system software with device events, manages permissions of device nodes, may create additional symlinks in the /dev -directory, or renames network interfaces\&. The kernel usually just assigns unpredictable device names based on the order of discovery\&. Meaningful symlinks or network device names provide a way to reliably identify devices based on their properties or current configuration\&. +directory and may rename network interfaces\&. The kernel usually just assigns unpredictable device names based on the order of discovery\&. Meaningful symlinks or network device names provide a way to reliably identify devices based on their properties or current configuration\&. .PP The udev daemon, \fBudevd\fR(8), receives device uevents directly from the kernel whenever a device is added or removed from the system, or it changes its state\&. When udev receives a device event, it matches its configured set of rules against various device attributes to identify the device\&. Rules that match may provide additional device information to be stored in the udev database or to be used to create meaningful symlink names\&. @@ -539,18 +539,17 @@ character itself\&. .PP The hwdb files are read from the files located in the system hwdb directory /usr/lib/udev/hwdb\&.d, the volatile runtime directory -/run/udev/hwdb\&.d -the local administration directory +/run/udev/hwdb\&.d, the local administration directory /etc/udev/hwdb\&.d, and any other directory in the \fBUDEV_HWDB_PATH\fR search path variable\&. All hwdb files are collectively sorted and processed in lexical order, regardless of the directories in which they live\&. However, files with identical filenames replace each other\&. Files in /etc -have the highest priority, files in -/run -take precedence over files with the same name in -/usr/lib, and the content of +have the highest priority, then files in +/run, +/usr/lib +and the ones in \fBUDEV_HWDB_PATH\fR -comes last\&. This order can be used to override a system\-supplied hwdb file with a local file if needed; a symlink in +comes last\&. Files with higher priority take precedence over files with the same name and lower priority\&. This order can be used to override a system\-supplied hwdb file with a local file if needed; a symlink in /etc with the same name as a hwdb file in /usr/lib, pointing to @@ -568,11 +567,9 @@ The content of all hwdb files is read by \fBudevadm\fR(8) and compiled to a binary database located at /etc/udev/hwdb\&.bin, or alternatively -/usr/lib/udev/hwdb\&.bin -if you want ship the compiled database in an immutable image by using +/usr/lib/udev/hwdb\&.bin, if you want to ship the compiled database in an immutable image by using \fB\-\-usr\fR, or anywhere on the system by using -\fB\-\-output\fR\&. During runtime only the binary database is used\&. -If +\fB\-\-output\fR\&. If \fBUDEV_HWDB_BIN\fR is set at run\-time, and its value identifies a file in the file system, then the binary database located under this name will be used\&. During runtime only the binary database is used\&. .SH "SEE ALSO" diff --git a/man/udev.xml b/man/udev.xml index 2caad59bb..daeda741e 100644 --- a/man/udev.xml +++ b/man/udev.xml @@ -35,8 +35,8 @@ Description udev supplies the system software with device events, manages permissions - of device nodes and may create additional symlinks in the /dev - directory, or renames network interfaces. The kernel usually just assigns unpredictable + of device nodes, may create additional symlinks in the /dev + directory and may rename network interfaces. The kernel usually just assigns unpredictable device names based on the order of discovery. Meaningful symlinks or network device names provide a way to reliably identify devices based on their properties or current configuration. @@ -737,21 +737,22 @@ Hardware Database Files The hwdb files are read from the files located in the system hwdb directory /usr/lib/udev/hwdb.d, - the volatile runtime directory /run/udev/hwdb.d + the volatile runtime directory /run/udev/hwdb.d, the local administration directory /etc/udev/hwdb.d, - and any other directory in the UDEV_HWDB_PATH search path variable. - All hwdb files are collectively sorted and processed in lexical order, - regardless of the directories in which they live. However, files with - identical filenames replace each other. Files in /etc - have the highest priority, files in /run - take precedence over files with the same name in - /usr/lib, and the content of - UDEV_HWDB_PATH comes last. This order can be - used to override a system-supplied hwdb file with a local file if needed; - a symlink in /etc with the same name as a hwdb file in - /usr/lib, pointing to /dev/null, - disables the hwdb file entirely. hwdb files must have the extension - .hwdb; other extensions are ignored. + and any other directory in the UDEV_HWDB_PATH search path + variable. All hwdb files are collectively sorted and processed in + lexical order, regardless of the directories in which they live. However, + files with identical filenames replace each other. Files in + /etc have the highest priority, then files in + /run, /usr/lib and the ones in + UDEV_HWDB_PATH comes last. Files with higher priority + take precedence over files with the same name and lower priority. + This order can be used to override a system-supplied hwdb file with a + local file if needed; a symlink in /etc with the + same name as a hwdb file in /usr/lib, pointing to + /dev/null, disables the hwdb file entirely. hwdb + files must have the extension .hwdb; other + extensions are ignored. The hwdb file contains data records consisting of matches and associated key-value pairs. Every record in the hwdb starts with one or @@ -766,14 +767,17 @@ by =. An empty line signifies the end of a record. Lines beginning with # are ignored. - The content of all hwdb files is read by - udevadm8 - and compiled to a binary database located at /etc/udev/hwdb.bin, - or alternatively /usr/lib/udev/hwdb.bin if you want ship the compiled - If UDEV_HWDB_BIN - is set at run-time, and its value identifies a file in the file system, then the binary - database located under this name will be used. - During runtime only the binary database is used. + The content of all hwdb files is read by + udevadm8 + and compiled to a binary database located at + /etc/udev/hwdb.bin, or alternatively + /usr/lib/udev/hwdb.bin, if you want to ship the + compiled database in an immutable image by using , + or anywhere on the system by using . + If UDEV_HWDB_BIN is set at run-time, and its value + identifies a file in the file system, then the binary database located + under this name will be used. During runtime only the binary database is + used.