From 93bc913f142b42a481ca0466ebf31228e1132cdb Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mon, 4 Aug 2014 11:54:19 -0400 Subject: man: add udev.conf(5) We generally have separate man pages for all configuration files. In this case udev.conf was already described in systemd-udevd.service(8), but it was hard to find. Docbook makes it hard to add a .so link from a different section, so describe udev.conf in its own page. Signedaoff-by: Anthony G. Basile --- .gitignore | 1 + man/Makefile.am | 5 ++++ man/udev.conf.xml | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ man/udevadm.xml | 1 - man/udevd.xml | 44 ++++++++++----------------- src/udev/udev.conf | 2 +- 6 files changed, 110 insertions(+), 31 deletions(-) create mode 100644 man/udev.conf.xml diff --git a/.gitignore b/.gitignore index afd8e6f6fd..7fb273fb21 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ docs/libudev/version.xml docs/gudev/gudev-overrides.txt docs/libudev/libudev-overrides.txt man/udev.7 +man/udev.conf.5 man/udevd.8 man/udevadm.8 rule_generator/write_cd_rules diff --git a/man/Makefile.am b/man/Makefile.am index 80d2086772..ea8d982378 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -2,6 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} XMLPAGES = \ udev.xml \ + udev.conf.xml \ udevd.xml \ udevadm.xml @@ -13,6 +14,7 @@ EXTRA_DIST = \ MANPAGES = \ udev.7 \ + udev.conf.5 \ udevd.8 \ udevadm.8 @@ -35,6 +37,9 @@ XSLTPROC_PROCESS_MAN = \ udev.7: udev.xml $(XSLTPROC_PROCESS_MAN) +udev.conf.5: udev.conf.xml + $(XSLTPROC_PROCESS_MAN) + udevd.8: udevd.xml $(XSLTPROC_PROCESS_MAN) diff --git a/man/udev.conf.xml b/man/udev.conf.xml new file mode 100644 index 0000000000..de84b91258 --- /dev/null +++ b/man/udev.conf.xml @@ -0,0 +1,88 @@ + + + + + + + + + + udev.conf + systemd + + + Developer + Kay + Sievers + kay@vrfy.org + + + + + + udev.conf + 5 + + + + udev.conf + Configuration for device event managing daemon + + + + /etc/udev/udev.conf + + + + Description + + + 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: + + + + udev_log + + + The logging priority. Valid values are the numerical + syslog priorities or their textual representations: + , and + . + + + + + + + See Also + + systemd-udevd8, + udev7, + udevadm8 + + + diff --git a/man/udevadm.xml b/man/udevadm.xml index 1b349c6b4e..51afbf3028 100644 --- a/man/udevadm.xml +++ b/man/udevadm.xml @@ -20,7 +20,6 @@ udevadm 8 - diff --git a/man/udevd.xml b/man/udevd.xml index c72484c556..89722050a4 100644 --- a/man/udevd.xml +++ b/man/udevd.xml @@ -20,7 +20,6 @@ udevd 8 - @@ -46,12 +45,16 @@ Description udevd listens to kernel uevents. - For every event, udevd executes matching instructions - specified in udev rules. See - udev7 - . - The behavior of the running daemon can be changed with - udevadm control. + For every event, udevd executes matching instructions + specified in udev rules. See + udev7 + . + + The behavior of the running daemon can be changed + dynamically with udevadm control, or + configured using + udev.conf5. + Options @@ -159,29 +162,12 @@ - Configuration file - udev 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: - - - udev_log - - The logging priority. Valid values are the numerical syslog priorities - or their textual representations: , - and . - - - - - See Also - - udev7 - , - udevadm8 - + + udev.conf5, + udev7, + udevadm8 + diff --git a/src/udev/udev.conf b/src/udev/udev.conf index f39253eb67..47d1433002 100644 --- a/src/udev/udev.conf +++ b/src/udev/udev.conf @@ -1,3 +1,3 @@ -# see udev(7) for details +# see udev.conf(5) for details #udev_log="info" -- cgit v1.2.3-54-g00ecf