summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-11-13 11:33:32 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-11-13 14:35:36 +0100
commita14e7af16216170bd5d181acafef10254a47f3ae (patch)
tree5dd1b043e6355d1c579af44cd8ae4b8b792c7f9c /src/udev
parentbc768f04754eee04a3468f333538985ce98ce495 (diff)
downloadsystemd-a14e7af16216170bd5d181acafef10254a47f3ae.tar.gz
systemd-a14e7af16216170bd5d181acafef10254a47f3ae.tar.bz2
systemd-a14e7af16216170bd5d181acafef10254a47f3ae.zip
udev: also allow resolve_names= to be specified in udev.conf
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/udev.conf1
-rw-r--r--src/udev/udevd.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/udev/udev.conf b/src/udev/udev.conf
index 3395a8b7ea..7deb7715be 100644
--- a/src/udev/udev.conf
+++ b/src/udev/udev.conf
@@ -7,3 +7,4 @@
#children_max=
#exec_delay=
#event_timeout=180
+#resolve_names=early
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 9b316c80db..922fecb897 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1703,7 +1703,7 @@ int main(int argc, char *argv[]) {
int r;
log_set_target(LOG_TARGET_AUTO);
- udev_parse_config_full(&arg_children_max, &arg_exec_delay_usec, &arg_event_timeout_usec);
+ udev_parse_config_full(&arg_children_max, &arg_exec_delay_usec, &arg_event_timeout_usec, &arg_resolve_name_timing);
log_parse_environment();
log_open();