[systemd-commits] Makefile.am man/systemd-udevd.service.xml man/systemd-udevd.xml man/udev.xml man/udevadm.xml units/systemd-udev-control.socket units/systemd-udev-kernel.socket units/systemd-udev-settle.service.in units/systemd-udev-trigger.service.in units/systemd-udev.service.in
Lennart Poettering
lennart at kemper.freedesktop.org
Fri Jun 22 01:39:43 PDT 2012
Makefile.am | 3
man/systemd-udevd.service.xml | 159 ++++++++++++++++++++++++++++++++++
man/systemd-udevd.xml | 154 --------------------------------
man/udev.xml | 4
man/udevadm.xml | 2
units/systemd-udev-control.socket | 3
units/systemd-udev-kernel.socket | 3
units/systemd-udev-settle.service.in | 3
units/systemd-udev-trigger.service.in | 3
units/systemd-udev.service.in | 3
10 files changed, 170 insertions(+), 167 deletions(-)
New commits:
commit b79f817b1bec4f7e39a1ed8b9d42a0c191c22ef5
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Jun 22 10:38:40 2012 +0200
man: refer to udevd by its service name not binary name
Since the binary name is now hidden away in /usr/lib/ the primary user
handle for the udev service is the unit name, hence change the man page
to be available under the unit name, and make the binary name an alias
for it.
diff --git a/Makefile.am b/Makefile.am
index 69a842b..e1e02b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1424,6 +1424,9 @@ libudev_private_la_LIBADD = \
MANPAGES += \
man/udev.7 \
man/udevadm.8 \
+ man/systemd-udevd.service.8
+
+MANPAGES_ALIAS += \
man/systemd-udevd.8
udev-confdirs:
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
new file mode 100644
index 0000000..09b4744
--- /dev/null
+++ b/man/systemd-udevd.service.xml
@@ -0,0 +1,159 @@
+<?xml version='1.0'?>
+<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<refentry id="systemd-udevd">
+ <refentryinfo>
+ <title>udevd</title>
+ <productname>systemd</productname>
+ <authorgroup>
+ <author>
+ <contrib>Developer</contrib>
+ <firstname>Kay</firstname>
+ <surname>Sievers</surname>
+ <email>kay at vrfy.org</email>
+ </author>
+ </authorgroup>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>systemd-udevd</refentrytitle>
+ <manvolnum>8</manvolnum>
+ <refmiscinfo class="version"></refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+ <refname>systemd-udevd.service</refname>
+ <refname>systemd-udevd</refname>
+ <refpurpose>Device event managing daemon</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <para><filename>systemd-logind.service</filename></para>
+
+ <cmdsynopsis>
+ <command>/usr/lib/systemd/systemd-udevd</command>
+ <arg><option>--daemon</option></arg>
+ <arg><option>--debug</option></arg>
+ <arg><option>--children-max=</option></arg>
+ <arg><option>--exec-delay=</option></arg>
+ <arg><option>--resolve-names=early|late|never</option></arg>
+ <arg><option>--version</option></arg>
+ <arg><option>--help</option></arg>
+ </cmdsynopsis>
+
+ </refsynopsisdiv>
+
+ <refsect1><title>Description</title>
+ <para>systemd-udevd listens to kernel uevents. For every event, systemd-udevd executes matching
+ instructions specified in udev rules. See <citerefentry>
+ <refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum>
+ </citerefentry>.</para>
+ <para>The behavior of the running daemon can be changed with
+ <command>udevadm control</command>.</para>
+ </refsect1>
+
+ <refsect1><title>Options</title>
+ <variablelist>
+ <varlistentry>
+ <term><option>--daemon</option></term>
+ <listitem>
+ <para>Detach and run in the background.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--debug</option></term>
+ <listitem>
+ <para>Print debug messages to stderr.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--children-max=</option></term>
+ <listitem>
+ <para>Limit the number of parallel executed events.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--exec-delay=</option></term>
+ <listitem>
+ <para>Number of seconds to delay the execution of RUN instructions.
+ This might be useful when debugging system crashes during coldplug
+ cause by loading non-working kernel modules.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--resolve-names=</option></term>
+ <listitem>
+ <para>Specify when systemd-udevd should resolve names of users and groups.
+ When set to <option>early</option> (the default) names will be
+ resolved when the rules are parsed. When set to
+ <option>late</option> names will be resolved for every event.
+ When set to <option>never</option> names will never be resolved
+ and all devices will be owned by root.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--version</option></term>
+ <listitem>
+ <para>Print version number.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--help</option></term>
+ <listitem>
+ <para>Print help text.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1><title>Environment</title>
+ <variablelist>
+ <varlistentry>
+ <term><varname>UDEV_LOG=</varname></term>
+ <listitem>
+ <para>Set the logging priority.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1><title>Kernel command line</title>
+ <variablelist>
+ <para>The parameters starting with "rd.", will be read when udev is used in an initrd.</para>
+ <varlistentry>
+ <term><varname>udev.log-priority=</varname></term>
+ <term><varname>rd.udev.log-priority=</varname></term>
+ <listitem>
+ <para>Set the logging priority.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><varname>udev.children-max=</varname></term>
+ <term><varname>rd.udev.children-max=</varname></term>
+ <listitem>
+ <para>Limit the number of parallel executed events.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><varname>udev.exec-delay=</varname></term>
+ <term><varname>rd.udev.exec-delay=</varname></term>
+ <listitem>
+ <para>Number of seconds to delay the execution of RUN instructions.
+ This might be useful when debugging system crashes during coldplug
+ cause by loading non-working kernel modules.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>See Also</title>
+ <para><citerefentry>
+ <refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum>
+ </citerefentry>, <citerefentry>
+ <refentrytitle>udevadm</refentrytitle><manvolnum>8</manvolnum>
+ </citerefentry></para>
+ </refsect1>
+</refentry>
diff --git a/man/systemd-udevd.xml b/man/systemd-udevd.xml
deleted file mode 100644
index 79f917e..0000000
--- a/man/systemd-udevd.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version='1.0'?>
-<?xml-stylesheet type="text/xsl" href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="systemd-udevd">
- <refentryinfo>
- <title>udevd</title>
- <productname>systemd</productname>
- <authorgroup>
- <author>
- <contrib>Developer</contrib>
- <firstname>Kay</firstname>
- <surname>Sievers</surname>
- <email>kay at vrfy.org</email>
- </author>
- </authorgroup>
- </refentryinfo>
-
- <refmeta>
- <refentrytitle>systemd-udevd</refentrytitle>
- <manvolnum>8</manvolnum>
- <refmiscinfo class="version"></refmiscinfo>
- </refmeta>
-
- <refnamediv>
- <refname>systemd-udevd</refname><refpurpose>event managing daemon</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>systemd-udevd</command>
- <arg><option>--daemon</option></arg>
- <arg><option>--debug</option></arg>
- <arg><option>--children-max=</option></arg>
- <arg><option>--exec-delay=</option></arg>
- <arg><option>--resolve-names=early|late|never</option></arg>
- <arg><option>--version</option></arg>
- <arg><option>--help</option></arg>
- </cmdsynopsis>
- </refsynopsisdiv>
-
- <refsect1><title>Description</title>
- <para>systemd-udevd listens to kernel uevents. For every event, systemd-udevd executes matching
- instructions specified in udev rules. See <citerefentry>
- <refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum>
- </citerefentry>.</para>
- <para>The behavior of the running daemon can be changed with
- <command>udevadm control</command>.</para>
- </refsect1>
-
- <refsect1><title>Options</title>
- <variablelist>
- <varlistentry>
- <term><option>--daemon</option></term>
- <listitem>
- <para>Detach and run in the background.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>--debug</option></term>
- <listitem>
- <para>Print debug messages to stderr.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>--children-max=</option></term>
- <listitem>
- <para>Limit the number of parallel executed events.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>--exec-delay=</option></term>
- <listitem>
- <para>Number of seconds to delay the execution of RUN instructions.
- This might be useful when debugging system crashes during coldplug
- cause by loading non-working kernel modules.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>--resolve-names=</option></term>
- <listitem>
- <para>Specify when systemd-udevd should resolve names of users and groups.
- When set to <option>early</option> (the default) names will be
- resolved when the rules are parsed. When set to
- <option>late</option> names will be resolved for every event.
- When set to <option>never</option> names will never be resolved
- and all devices will be owned by root.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>--version</option></term>
- <listitem>
- <para>Print version number.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>--help</option></term>
- <listitem>
- <para>Print help text.</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1><title>Environment</title>
- <variablelist>
- <varlistentry>
- <term><varname>UDEV_LOG=</varname></term>
- <listitem>
- <para>Set the logging priority.</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1><title>Kernel command line</title>
- <variablelist>
- <para>The parameters starting with "rd.", will be read when udev is used in an initrd.</para>
- <varlistentry>
- <term><varname>udev.log-priority=</varname></term>
- <term><varname>rd.udev.log-priority=</varname></term>
- <listitem>
- <para>Set the logging priority.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><varname>udev.children-max=</varname></term>
- <term><varname>rd.udev.children-max=</varname></term>
- <listitem>
- <para>Limit the number of parallel executed events.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><varname>udev.exec-delay=</varname></term>
- <term><varname>rd.udev.exec-delay=</varname></term>
- <listitem>
- <para>Number of seconds to delay the execution of RUN instructions.
- This might be useful when debugging system crashes during coldplug
- cause by loading non-working kernel modules.</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
-
- <refsect1>
- <title>See Also</title>
- <para><citerefentry>
- <refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum>
- </citerefentry>, <citerefentry>
- <refentrytitle>udevadm</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry></para>
- </refsect1>
-</refentry>
diff --git a/man/udev.xml b/man/udev.xml
index bd0dec6..b5c7cd4 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -41,7 +41,7 @@
names provide a way to reliably identify devices based on their properties or
current configuration.</para>
- <para>The udev daemon, <citerefentry><refentrytitle>systemd-udevd</refentrytitle>
+ <para>The udev daemon, <citerefentry><refentrytitle>systemd-udevd.service</refentrytitle>
<manvolnum>8</manvolnum></citerefentry>, receives device uevents directly from
the kernel whenever a device is added or removed from the system, or it changes its
state. When udev receives a device event, it matches its configured set of rules
@@ -691,7 +691,7 @@
<refsect1>
<title>See Also</title>
<para><citerefentry>
- <refentrytitle>systemd-udevd</refentrytitle><manvolnum>8</manvolnum>
+ <refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum>
</citerefentry>,
<citerefentry>
<refentrytitle>udevadm</refentrytitle><manvolnum>8</manvolnum>
diff --git a/man/udevadm.xml b/man/udevadm.xml
index d0cd922..b46a5f5 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -463,7 +463,7 @@
<refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum>
</citerefentry>
<citerefentry>
- <refentrytitle>systemd-udevd</refentrytitle><manvolnum>8</manvolnum>
+ <refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum>
</citerefentry></para>
</refsect1>
</refentry>
diff --git a/units/systemd-udev-control.socket b/units/systemd-udev-control.socket
index 5b25e06..e835ab6 100644
--- a/units/systemd-udev-control.socket
+++ b/units/systemd-udev-control.socket
@@ -7,8 +7,7 @@
[Unit]
Description=udev Control Socket
-Documentation=man:udev(7)
-Documentation=man:systemd-udevd(8)
+Documentation=man:udev(7) man:systemd-udevd.service(8)
DefaultDependencies=no
ConditionCapability=CAP_MKNOD
diff --git a/units/systemd-udev-kernel.socket b/units/systemd-udev-kernel.socket
index 68c23a6..321dd46 100644
--- a/units/systemd-udev-kernel.socket
+++ b/units/systemd-udev-kernel.socket
@@ -7,8 +7,7 @@
[Unit]
Description=udev Kernel Socket
-Documentation=man:udev(7)
-Documentation=man:systemd-udevd(8)
+Documentation=man:udev(7) man:systemd-udevd.service(8)
DefaultDependencies=no
ConditionCapability=CAP_MKNOD
diff --git a/units/systemd-udev-settle.service.in b/units/systemd-udev-settle.service.in
index 2c4c129..004b316 100644
--- a/units/systemd-udev-settle.service.in
+++ b/units/systemd-udev-settle.service.in
@@ -17,8 +17,7 @@
[Unit]
Description=udev Wait for Complete Device Initialization
-Documentation=man:udev(7)
-Documentation=man:systemd-udevd(8)
+Documentation=man:udev(7) man:systemd-udevd.service(8)
DefaultDependencies=no
Wants=systemd-udev.service
After=systemd-udev-trigger.service
diff --git a/units/systemd-udev-trigger.service.in b/units/systemd-udev-trigger.service.in
index 2f34d53..9d3f43e 100644
--- a/units/systemd-udev-trigger.service.in
+++ b/units/systemd-udev-trigger.service.in
@@ -7,8 +7,7 @@
[Unit]
Description=udev Coldplug all Devices
-Documentation=man:udev(7)
-Documentation=man:systemd-udevd(8)
+Documentation=man:udev(7) man:systemd-udevd.service(8)
Wants=systemd-udev.service
After=systemd-udev-kernel.socket systemd-udev-control.socket
DefaultDependencies=no
diff --git a/units/systemd-udev.service.in b/units/systemd-udev.service.in
index a78dc8b..f02c602 100644
--- a/units/systemd-udev.service.in
+++ b/units/systemd-udev.service.in
@@ -7,8 +7,7 @@
[Unit]
Description=udev Kernel Device Manager
-Documentation=man:udev(7)
-Documentation=man:systemd-udevd(8)
+Documentation=man:udev(7) man:systemd-udevd.service(8)
Wants=systemd-udev-control.socket systemd-udev-kernel.socket
After=systemd-udev-control.socket systemd-udev-kernel.socket
Before=basic.target
More information about the systemd-commits
mailing list