AuxXxilium/eudev
1
0
Fork 0
mirror of https://github.com/AuxXxilium/eudev.git synced 2024-11-23 15:00:56 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Boian Bonev 2023-10-01 00:26:08 +03:00 committed by GitHub
commit 060dc0ffaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 108 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
man/udev.7
View File

@ -34,7 +34,10 @@ All device information udev processes is stored in the udev database and sent ou
.SH "RULES FILES"
.PP
The udev rules are read from the files located in the system rules directory
/lib/udev/rules\&.d, the volatile runtime directory
/lib/udev/rules\&.d
(additionally
/usr/lib/udev/rules\&.d
when built with \-\-enable\-split\-usr), the volatile runtime directory
/run/udev/rules\&.d
and the local administration directory
/etc/udev/rules\&.d\&. All rules 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
@ -42,7 +45,9 @@ and the local administration directory
have the highest priority, files in
/run
take precedence over files with the same name in
/lib\&. This can be used to override a system\-supplied rules file with a local file if needed; a symlink in
/lib
(or
/usr/lib)\&. This can be used to override a system\-supplied rules file with a local file if needed; a symlink in
/etc
with the same name as a rules file in
/lib, pointing to
@ -564,7 +569,12 @@ The content of all hwdb files is read by
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\&. During runtime only the binary database is used\&.
if you want 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
\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"
.PP
\fBudevd\fR(8),

12
man/udev.xml
View File

@ -55,15 +55,17 @@
</refsect1>
<refsect1><title>Rules Files</title>
<para>The udev rules are read from the files located in the
system rules directory <filename>/lib/udev/rules.d</filename>,
<para>The udev rules are read from the files located in the system rules
directory <filename>/lib/udev/rules.d</filename> (additionally
<filename>/usr/lib/udev/rules.d</filename> when built with --enable-split-usr),
the volatile runtime directory <filename>/run/udev/rules.d</filename>
and the local administration directory <filename>/etc/udev/rules.d</filename>.
All rules 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 <filename>/etc</filename>
have the highest priority, files in <filename>/run</filename> take precedence
over files with the same name in <filename>/lib</filename>. This can be
over files with the same name in <filename>/lib</filename> (or
<filename>/usr/lib</filename>). This can be
used to override a system-supplied rules file with a local file if needed;
a symlink in <filename>/etc</filename> with the same name as a rules file in
<filename>/lib</filename>, pointing to <filename>/dev/null</filename>,
@ -768,7 +770,9 @@
<citerefentry><refentrytitle>udevadm</refentrytitle><manvolnum>8</manvolnum></citerefentry>
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.
If <envar>UDEV_HWDB_BIN</envar>
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.</para>
</refsect1>

5
man/udevadm.8
View File

@ -384,6 +384,11 @@ Query the database with a modalias string, and print the retrieved properties\&.
Alternative root path in the file system for reading and writing files\&.
.RE
.PP
\fB\-o\fR, \fB\-\-output=\fR\fB\fIstring\fR\fR
.RS 4
Specify the exact location where to write the compiled database\&.
.RE
.PP
\fB\-h\fR, \fB\-\-help\fR
.RS 4
Print help text\&.

7
man/udevadm.xml
View File

@ -557,6 +557,13 @@
<para>Alternative root path in the file system for reading and writing files.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>-o</option></term>
<term><option>--output=<replaceable>string</replaceable></option></term>
<listitem>
<para>Specify the exact location where to write the compiled database.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>-h</option></term>
<term><option>--help</option></term>

37
src/libudev/libudev-hwdb.c
View File

@ -47,6 +47,7 @@ struct udev_hwdb {
struct udev *udev;
int refcount;
char *bin_paths;
FILE *f;
struct stat st;
union {
@ -256,10 +257,28 @@ static int trie_search_f(struct udev_hwdb *hwdb, const char *search) {
return 0;
}
static const char hwdb_bin_paths[] =
"/etc/udev/hwdb.bin\0"
UDEV_LIBEXEC_DIR "/hwdb.bin\0";
static char *get_hwdb_bin_paths (void) {
static const char default_locations[] =
"/etc/udev/hwdb.bin\0"
UDEV_LIBEXEC_DIR "/hwdb.bin\0";
const char *by_env = getenv("UDEV_HWDB_BIN");
if (by_env != NULL) {
char *path = malloc(strlen(by_env) + 1
+ sizeof (default_locations));
if (path != NULL) {
memcpy(path, by_env, strlen(by_env) + 1);
memcpy(path + strlen(by_env) + 1,
default_locations,
sizeof (default_locations));
}
return path;
}
char *path = malloc(sizeof (default_locations));
if (path != NULL) {
memcpy(path, default_locations, sizeof (default_locations));
}
return path;
}
/**
* udev_hwdb_new:
@ -282,7 +301,12 @@ _public_ struct udev_hwdb *udev_hwdb_new(struct udev *udev) {
udev_list_init(udev, &hwdb->properties_list, true);
/* find hwdb.bin in hwdb_bin_paths */
NULSTR_FOREACH(hwdb_bin_path, hwdb_bin_paths) {
hwdb->bin_paths = get_hwdb_bin_paths();
if (hwdb->bin_paths == NULL) {
udev_hwdb_unref(hwdb);
return NULL;
}
NULSTR_FOREACH(hwdb_bin_path, hwdb->bin_paths) {
hwdb->f = fopen(hwdb_bin_path, "re");
if (hwdb->f)
break;
@ -363,6 +387,7 @@ _public_ struct udev_hwdb *udev_hwdb_unref(struct udev_hwdb *hwdb) {
return NULL;
if (hwdb->map)
munmap((void *)hwdb->map, hwdb->st.st_size);
free(hwdb->bin_paths);
if (hwdb->f)
fclose(hwdb->f);
udev_list_cleanup(&hwdb->properties_list);
@ -381,7 +406,7 @@ bool udev_hwdb_validate(struct udev_hwdb *hwdb) {
return false;
/* if hwdb.bin doesn't exist anywhere, we need to update */
NULSTR_FOREACH(p, hwdb_bin_paths) {
NULSTR_FOREACH(p, hwdb->bin_paths) {
if (stat(p, &st) >= 0) {
found = true;
break;

4
src/libudev/libudev.h
View File

@ -185,7 +185,9 @@ struct udev_list_entry *udev_queue_get_queued_list_entry(struct udev_queue *udev
/*
* udev_hwdb
*
* access to the static hardware properties database
* access to the static hardware properties database; the database to
* use can be overriden by setting the UDEV_HWDB_BIN environment
* variable to its file name
*/
struct udev_hwdb;
struct udev_hwdb *udev_hwdb_new(struct udev *udev);

4
src/udev/udev-rules.c
View File

@ -2602,6 +2602,10 @@ int udev_rules_apply_to_event(struct udev_rules *rules,
case TK_A_RUN_PROGRAM: {
struct udev_list_entry *entry;
if (event->run_final)
break;
if (cur->key.op == OP_ASSIGN_FINAL)
event->run_final = true;
if (cur->key.op == OP_ASSIGN || cur->key.op == OP_ASSIGN_FINAL)
udev_list_cleanup(&event->run_list);
log_debug("RUN '%s' %s:%u",

42
src/udev/udevadm-hwdb.c
View File

@ -570,6 +570,7 @@ static int import_file(struct udev *udev, struct trie *trie, const char *filenam
static void help(void) {
printf("Usage: udevadm hwdb OPTIONS\n"
" -u,--update update the hardware database\n"
" -o,--output=.../hwdb.bin generate in .../hwdb.bin instead of /etc/udev/hwdb.bin\n"
" --usr generate in " UDEV_LIBEXEC_DIR " instead of /etc/udev\n"
" -t,--test=MODALIAS query database and print result\n"
" -r,--root=PATH alternative root path in the filesystem\n"
@ -589,6 +590,7 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) {
static const struct option options[] = {
{ "update", no_argument, NULL, 'u' },
{ "usr", no_argument, NULL, ARG_USR },
{ "output", required_argument, NULL, 'o' },
{ "test", required_argument, NULL, 't' },
{ "root", required_argument, NULL, 'r' },
{ "help", no_argument, NULL, 'h' },
@ -596,19 +598,37 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) {
};
const char *test = NULL;
const char *root = "";
const char *hwdb_bin_dir = "/etc/udev";
bool update = false;
struct trie *trie = NULL;
int err, c;
int rc = EXIT_SUCCESS;
while ((c = getopt_long(argc, argv, "ut:r:h", options, NULL)) >= 0)
_cleanup_free_ char *hwdb_bin = strdup("/etc/udev/hwdb.bin");
if (hwdb_bin == NULL) {
rc = EXIT_FAILURE;
goto out;
}
while ((c = getopt_long(argc, argv, "uo:t:r:h", options, NULL)) >= 0)
switch(c) {
case 'u':
update = true;
break;
case ARG_USR:
hwdb_bin_dir = UDEV_LIBEXEC_DIR;
free(hwdb_bin);
hwdb_bin = strdup(UDEV_LIBEXEC_DIR "/hwdb.bin");
if (hwdb_bin == NULL) {
rc = EXIT_FAILURE;
goto out;
}
break;
case 'o':
free(hwdb_bin);
hwdb_bin = strdup(optarg);
if (hwdb_bin == NULL) {
rc = EXIT_FAILURE;
goto out;
}
break;
case 't':
test = optarg;
@ -632,7 +652,20 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) {
if (update) {
char **files, **f;
_cleanup_free_ char *hwdb_bin = NULL;
if (strlen(root)) {
/* --root has been specified, prepend it to
the hwdb.bin destination file. */
char *full_hwdb_bin = strjoin(root, "/", hwdb_bin, NULL);
/* Do nothing if no --root, so that hwdb_bin
may still be relative. */
if (full_hwdb_bin == NULL) {
rc = EXIT_FAILURE;
goto out;
}
free (hwdb_bin);
hwdb_bin = full_hwdb_bin;
}
trie = new0(struct trie, 1);
if (!trie) {
@ -690,7 +723,6 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) {
log_debug("strings dedup'ed: %8zu bytes (%8zu)",
trie->strings->dedup_len, trie->strings->dedup_count);
hwdb_bin = strjoin(root, "/", hwdb_bin_dir, "/hwdb.bin", NULL);
if (!hwdb_bin) {
rc = EXIT_FAILURE;
goto out;