chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: re-initialize builtins in the daemon process, not in the worker
[elogind.git]
/
src
/
udev
/
udevd.c
diff --git
a/src/udev/udevd.c
b/src/udev/udevd.c
index b78c18f20a85f930ec7d3fd0308323116bd23bcc..23351aebd5685b9c02e51af23e0ad2a34d30036b 100644
(file)
--- a/
src/udev/udevd.c
+++ b/
src/udev/udevd.c
@@
-1107,7
+1107,7
@@
int main(int argc, char *argv[])
case 'D':
debug = true;
log_set_max_level(LOG_DEBUG);
case 'D':
debug = true;
log_set_max_level(LOG_DEBUG);
- udev_set_log_priority(udev, LOG_
INFO
);
+ udev_set_log_priority(udev, LOG_
DEBUG
);
break;
case 'N':
if (strcmp (optarg, "early") == 0) {
break;
case 'N':
if (strcmp (optarg, "early") == 0) {
@@
-1486,7
+1486,7
@@
int main(int argc, char *argv[])
worker_kill(udev);
rules = udev_rules_unref(rules);
udev_builtin_exit(udev);
worker_kill(udev);
rules = udev_rules_unref(rules);
udev_builtin_exit(udev);
- reload =
0
;
+ reload =
false
;
}
/* event has finished */
}
/* event has finished */
@@
-1506,6
+1506,7
@@
int main(int argc, char *argv[])
/* start new events */
if (!udev_list_node_is_empty(&event_list) && !udev_exit && !stop_exec_queue) {
/* start new events */
if (!udev_list_node_is_empty(&event_list) && !udev_exit && !stop_exec_queue) {
+ udev_builtin_init(udev);
if (rules == NULL)
rules = udev_rules_new(udev, resolve_names);
if (rules != NULL)
if (rules == NULL)
rules = udev_rules_new(udev, resolve_names);
if (rules != NULL)