summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-11-13 11:10:13 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-11-13 14:03:47 +0100
commit4b3ca79ea9e69fcf3e3d376e6342130aa4564b9b (patch)
tree8a8a02299305a1b430d8e2316443782014138d5c /src/udev
parent66f737b415e61f150c49480a74344877a63ac016 (diff)
downloadsystemd-4b3ca79ea9e69fcf3e3d376e6342130aa4564b9b.tar.gz
systemd-4b3ca79ea9e69fcf3e3d376e6342130aa4564b9b.tar.bz2
systemd-4b3ca79ea9e69fcf3e3d376e6342130aa4564b9b.zip
udevd: allow more parameters to be set through udev.conf
Rebooting to set change the kernel command line to set some udev parameters is inconvenient. Let's allow setting more stuff in the config file. Also drop quotes from around "info" in udev.conf. We need to accept them for compatibility, but there is no reason to use them.
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/udev.conf5
-rw-r--r--src/udev/udevd.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/udev/udev.conf b/src/udev/udev.conf
index 0d812d4a65..3395a8b7ea 100644
--- a/src/udev/udev.conf
+++ b/src/udev/udev.conf
@@ -3,4 +3,7 @@
# udevd is also started in the initrd. When this file is modified you might
# also want to rebuild the initrd, so that it will include the modified configuration.
-#udev_log="info"
+#udev_log=info
+#children_max=
+#exec_delay=
+#event_timeout=180
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index c77ca57d93..9b316c80db 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();
+ udev_parse_config_full(&arg_children_max, &arg_exec_delay_usec, &arg_event_timeout_usec);
log_parse_environment();
log_open();