diff --git a/man/rules/meson.build b/man/rules/meson.build index 3592b862f71..50493754db1 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -1174,7 +1174,7 @@ manpages = [ ['timesyncd.conf', '5', ['timesyncd.conf.d'], 'ENABLE_TIMESYNCD'], ['tmpfiles.d', '5', [], ''], ['udev', '7', [], ''], - ['udev.conf', '5', [], ''], + ['udev.conf', '5', ['udev.conf.d'], ''], ['udev_device_get_syspath', '3', ['udev_device_get_action', diff --git a/man/udev.conf.xml b/man/udev.conf.xml index 4ebde474a30..054ab2d1395 100644 --- a/man/udev.conf.xml +++ b/man/udev.conf.xml @@ -18,23 +18,35 @@ udev.conf + udev.conf.d Configuration for device event managing daemon - /etc/udev/udev.conf + + + /etc/udev/udev.conf + /run/udev/udev.conf + /usr/lib/udev/udev.conf + /etc/udev/udev.conf.d/*.conf + /run/udev/udev.conf.d/*.conf + /usr/lib/udev/udev.conf.d/*.conf + + Description + These files contain configuration options for + systemd-udevd8. + The syntax of these files is very simple: a list + of assignments, one per line. + All empty lines or lines beginning with # are + ignored. + - systemd-udevd8 - expects its main configuration file at - /etc/udev/udev.conf. It consists of a set - of variables allowing the user to override default udev - values. All empty lines or lines beginning with '#' are - ignored. The following variables can be set: + The following options can be set: @@ -47,6 +59,12 @@ , and . + + This option is also honored by + udevadm8. + + +