udev: install udevd as /usr/lib/systemd/systemd-udevd

diff --git a/.gitignore b/.gitignore
index af7a017b6dc7c633e98a5a5d671d8cd8d2038dc6..08beb9afecf22e79b7c89fee41445b78a386f45e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -112,7 +112,7 @@ stamp-*
 /mtd_probe
 /scsi_id
 /udevadm
-/udevd
+/systemd-udevd
 /v4l_id
 /test-libudev
 /test-udev

diff --git a/Makefile.am b/Makefile.am
index 421d27c88659f7b73db180e7b3fafe80b1888459..90c225ec01ddd90bed03dfd792b86ddf7c59994f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,6 +101,7 @@ check_PROGRAMS =
 check_DATA =
 noinst_PROGRAMS =
 TESTS =
+udevlibexec_PROGRAMS =
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
@@ -296,8 +297,8 @@ dist_systemunit_DATA = \
        units/systemd-ask-password-wall.path \
        units/systemd-ask-password-console.path \
        units/syslog.target \
-       units/udev-control.socket \
-       units/udev-kernel.socket
+       units/systemd-udev-control.socket \
+       units/systemd-udev-kernel.socket
 
 nodist_systemunit_DATA = \
        units/getty@.service \
@@ -323,9 +324,9 @@ nodist_systemunit_DATA = \
        units/fsck-root.service \
        units/rescue.service \
        units/user@.service \
-       units/udev.service \
-       units/udev-trigger.service \
-       units/udev-settle.service
+       units/systemd-udev.service \
+       units/systemd-udev-trigger.service \
+       units/systemd-udev-settle.service
 
 dist_userunit_DATA = \
        units/user/default.target \
@@ -359,9 +360,9 @@ EXTRA_DIST += \
        units/fsck@.service.in \
        units/fsck-root.service.in \
        units/user@.service.in \
-       units/udev.service \
-       units/udev-trigger.service \
-       units/udev-settle.service \
+       units/systemd-udev.service \
+       units/systemd-udev-trigger.service \
+       units/systemd-udev-settle.service \
        introspect.awk \
        man/custom-html.xsl
 
@@ -1358,7 +1359,7 @@ libudev_private_la_LIBADD = \
 MANPAGES += \
        man/udev.7 \
        man/udevadm.8 \
-       man/udevd.8
+       man/systemd-udevd.8
 
 udev-confdirs:
        -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
@@ -1398,30 +1399,30 @@ CLEANFILES += \
        src/udev/udev.pc
 
 EXTRA_DIST += \
-       units/udev.service.in \
-       units/udev-trigger.service.in \
-       units/udev-settle.service.in
+       units/systemd-udev.service.in \
+       units/systemd-udev-trigger.service.in \
+       units/systemd-udev-settle.service.in
 
 CLEANFILES += \
-       units/udev.service \
-       units/udev-trigger.service \
-       units/udev-settle.service
+       units/systemd-udev.service \
+       units/systemd-udev-trigger.service \
+       units/systemd-udev-settle.service
 
 systemd-install-hook:
        mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
-       ln -sf ../udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-control.socket
-       ln -sf ../udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-kernel.socket
+       ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket
+       ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket
        mkdir -p $(DESTDIR)$(systemunitdir)/basic.target.wants
-       ln -sf ../udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev.service
-       ln -sf ../udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev-trigger.service
+       ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev.service
+       ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev-trigger.service
 
 INSTALL_DATA_HOOKS += systemd-install-hook
 
 bin_PROGRAMS += \
        udevadm
 
-udevlibexec_PROGRAMS = \
-       udevd
+rootlibexec_PROGRAMS += \
+       systemd-udevd
 
 noinst_LTLIBRARIES += \
        libudev-core.la
@@ -1469,10 +1470,10 @@ libudev_core_la_LIBADD += \
        libsystemd-acl.la
 endif
 
-udevd_SOURCES = \
+systemd_udevd_SOURCES = \
        src/udev/udevd.c
 
-udevd_LDADD = \
+systemd_udevd_LDADD = \
        libudev-core.la
 
 udevadm_SOURCES = \
@@ -3227,6 +3228,9 @@ install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
 
 distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
+clean-local:
+       rm -rf $(abs_srcdir)/install-tree
+
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
        --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
@@ -3249,3 +3253,8 @@ doc-sync: all
 
 git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"
+
+install-tree: all
+       rm -rf $(abs_srcdir)/install-tree
+       make install DESTDIR=$(abs_srcdir)/install-tree
+       tree $(abs_srcdir)/install-tree

diff --git a/NEWS b/NEWS
index 52196dc0b152c8c7b219d8fd70d2d7e135da6ae4..dc04d0a345f1e446e16d9f88bb1f1e409935142a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,8 +8,9 @@ CHANGES WITH 182:
           udev though, will require the *build* of the systemd tree, but
           udev can be properly *run* without systems.
 
-        * udev: /lib/udev/devices/ are not read anymore; tmpfiles should
-          be used to create workarounds for broken subsystems.
+        * udev: /lib/udev/devices/ are not read anymore; systemde-tmpfiles
+          should be used to create dead device nodes as workarounds for broken
+          subsystems.
 
         * udev: RUN+="socket:..."  and udev_monitor_new_from_socket() is
           no longer supported. udev_monitor_new_from_netlink() needs to be
@@ -22,6 +23,11 @@ CHANGES WITH 182:
           pulled-in by udev to ge started, but they can no longer be directly
           forked by udev rules.
 
+        * udev: the daemon binary is called systemd-udevd now and installed
+          in /usr/lib/systemd/. Standalone builds or non-systemd systems need
+          to adapt to that, create symlink, or rename the binary after building
+          it.
+
         * systemd-logingctl and systemd-journalctl have been renamed
           to logingctl and journalctl to match systemctl.
 

diff --git a/man/systemd-udevd.xml b/man/systemd-udevd.xml
new file mode 100644 (file)
index 0000000..1be356f
--- /dev/null
+++ b/man/systemd-udevd.xml
@@ -0,0 +1,150 @@
+<?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@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>
+      <varlistentry>
+        <term><varname>udev.log-priority=</varname></term>
+        <listitem>
+          <para>Set the logging priority.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><varname>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>
+        <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 458d351658d98ad69efc1a29c5b6390866865cb0..bd0dec6a6af360c005544c19f4f5836ee1587720 100644 (file)
--- 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>udevd</refentrytitle>
+    <para>The udev daemon, <citerefentry><refentrytitle>systemd-udevd</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
@@ -512,7 +512,7 @@
                 <listitem>
                   <para>Apply the permissions specified in this rule to the static device node with
                   the specified name. Static device node creation can be requested by kernel modules.
-                  These nodes might not have a corresponding kernel device at the time udevd is
+                  These nodes might not have a corresponding kernel device at the time systemd-udevd is
                   started; they can trigger automatic kernel module loading.</para>
                 </listitem>
               </varlistentry>
@@ -691,7 +691,7 @@
   <refsect1>
     <title>See Also</title>
     <para><citerefentry>
-        <refentrytitle>udevd</refentrytitle><manvolnum>8</manvolnum>
+        <refentrytitle>systemd-udevd</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
       <citerefentry>
         <refentrytitle>udevadm</refentrytitle><manvolnum>8</manvolnum>

diff --git a/man/udevadm.xml b/man/udevadm.xml
index 11900d202e14ab81ccc62f943f33226ed52adcd8..cbf22b4b5e4eb3b712665961101a0539b7cf7031 100644 (file)
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -322,13 +322,13 @@
         <varlistentry>
           <term><option>--exit</option></term>
           <listitem>
-            <para>Signal and wait for udevd to exit.</para>
+            <para>Signal and wait for systemd-udevd to exit.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term><option>--log-priority=<replaceable>value</replaceable></option></term>
           <listitem>
-            <para>Set the internal log level of udevd. Valid values are the numerical
+            <para>Set the internal log level of systemd-udevd. Valid values are the numerical
             syslog priorities or their textual representations: <option>err</option>,
             <option>info</option> and <option>debug</option>.</para>
           </listitem>
@@ -336,20 +336,20 @@
         <varlistentry>
           <term><option>--stop-exec-queue</option></term>
           <listitem>
-            <para>Signal udevd to stop executing new events. Incoming events
+            <para>Signal systemd-udevd to stop executing new events. Incoming events
             will be queued.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term><option>--start-exec-queue</option></term>
           <listitem>
-            <para>Signal udevd to enable the execution of events.</para>
+            <para>Signal systemd-udevd to enable the execution of events.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term><option>--reload</option></term>
           <listitem>
-            <para>Signal udevd to reload the rules files and other databases like the kernel
+            <para>Signal systemd-udevd to reload the rules files and other databases like the kernel
             module index. Reloading rules and databases does not apply any changes to already
             existing devices; the new configuration will only be applied to new events.</para>
           </listitem>
@@ -363,14 +363,14 @@
         <varlistentry>
           <term><option>--children-max=</option><replaceable>value</replaceable></term>
           <listitem>
-            <para>Set the maximum number of events, udevd will handle at the
+            <para>Set the maximum number of events, systemd-udevd will handle at the
             same time.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term><option>--timeout=</option><replaceable>seconds</replaceable></term>
           <listitem>
-            <para>The maximum number seconds to wait for a reply from udevd.</para>
+            <para>The maximum number seconds to wait for a reply from systemd-udevd.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
@@ -470,7 +470,7 @@
         <refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum>
     </citerefentry>
     <citerefentry>
-        <refentrytitle>udevd</refentrytitle><manvolnum>8</manvolnum>
+        <refentrytitle>systemd-udevd</refentrytitle><manvolnum>8</manvolnum>
     </citerefentry></para>
   </refsect1>
 </refentry>

diff --git a/man/udevd.xml b/man/udevd.xml
deleted file mode 100644 (file)
index 7c4e174..0000000
--- a/man/udevd.xml
+++ /dev/null
@@ -1,150 +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="udevd">
-  <refentryinfo>
-    <title>udevd</title>
-    <productname>systemd</productname>
-    <authorgroup>
-      <author>
-        <contrib>Developer</contrib>
-        <firstname>Kay</firstname>
-        <surname>Sievers</surname>
-        <email>kay@vrfy.org</email>
-      </author>
-    </authorgroup>
-  </refentryinfo>
-
-  <refmeta>
-    <refentrytitle>udevd</refentrytitle>
-    <manvolnum>8</manvolnum>
-    <refmiscinfo class="version"></refmiscinfo>
-  </refmeta>
-
-  <refnamediv>
-    <refname>udevd</refname><refpurpose>event managing daemon</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>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>udevd listens to kernel uevents. For every event, 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 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>
-      <varlistentry>
-        <term><varname>udev.log-priority=</varname></term>
-        <listitem>
-          <para>Set the logging priority.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><varname>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>
-        <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/units/.gitignore b/units/.gitignore
index 3cf64237a8a47d115ecf42e9e9b44150d4b83cc7..eda676a48004ff40b7cacafec3e7a13274cf7183 100644 (file)
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -41,6 +41,6 @@ systemd-update-utmp-shutdown.service
 test-env-replace
 systemd-binfmt.service
 emergency.service
-/udev-settle.service
-/udev-trigger.service
-/udev.service
+/systemd-udev-settle.service
+/systemd-udev-trigger.service
+/systemd-udev.service

diff --git a/units/systemd-udev-control.socket b/units/systemd-udev-control.socket
new file mode 100644 (file)
index 0000000..f80f774
--- /dev/null
+++ b/units/systemd-udev-control.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=udev Control Socket
+DefaultDependencies=no
+ConditionCapability=CAP_MKNOD
+
+[Socket]
+Service=udev.service
+ListenSequentialPacket=/run/udev/control
+SocketMode=0600
+PassCredentials=yes

diff --git a/units/systemd-udev-kernel.socket b/units/systemd-udev-kernel.socket
new file mode 100644 (file)
index 0000000..23fa9d5
--- /dev/null
+++ b/units/systemd-udev-kernel.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=udev Kernel Socket
+DefaultDependencies=no
+ConditionCapability=CAP_MKNOD
+
+[Socket]
+Service=udev.service
+ReceiveBuffer=134217728
+ListenNetlink=kobject-uevent 1
+PassCredentials=yes

diff --git a/units/systemd-udev-settle.service.in b/units/systemd-udev-settle.service.in
new file mode 100644 (file)
index 0000000..0a5e8c5
--- /dev/null
+++ b/units/systemd-udev-settle.service.in
@@ -0,0 +1,26 @@
+# This service is usually not enabled by default. If enabled, it
+# acts as a barrier for basic.target -- so all later services will
+# wait for udev completely finishing its coldplug run.
+#
+# If needed, to work around broken or non-hotplug-aware services,
+# it might be enabled unconditionally, or pulled-in on-demand by
+# the services that assume a fully populated /dev at startup. It
+# should not be used or pulled-in ever on systems without such
+# legacy services running.
+
+[Unit]
+Description=udev Wait for Complete Device Initialization
+DefaultDependencies=no
+Wants=udev.service
+After=udev-trigger.service
+Before=basic.target
+ConditionCapability=CAP_MKNOD
+
+[Service]
+Type=oneshot
+TimeoutSec=180
+RemainAfterExit=yes
+ExecStart=@bindir@/udevadm settle
+
+[Install]
+WantedBy=basic.target

diff --git a/units/systemd-udev-trigger.service.in b/units/systemd-udev-trigger.service.in
new file mode 100644 (file)
index 0000000..ce937ae
--- /dev/null
+++ b/units/systemd-udev-trigger.service.in
@@ -0,0 +1,11 @@
+[Unit]
+Description=udev Coldplug all Devices
+Wants=udev.service
+After=udev-kernel.socket udev-control.socket
+DefaultDependencies=no
+ConditionCapability=CAP_MKNOD
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=@bindir@/udevadm trigger --type=subsystems --action=add ; @bindir@/udevadm trigger --type=devices --action=add

diff --git a/units/systemd-udev.service.in b/units/systemd-udev.service.in
new file mode 100644 (file)
index 0000000..60d8601
--- /dev/null
+++ b/units/systemd-udev.service.in
@@ -0,0 +1,14 @@
+[Unit]
+Description=udev Kernel Device Manager
+Wants=udev-control.socket udev-kernel.socket
+After=udev-control.socket udev-kernel.socket
+Before=basic.target
+DefaultDependencies=no
+ConditionCapability=CAP_MKNOD
+
+[Service]
+Type=notify
+OOMScoreAdjust=-1000
+Sockets=systemd-udev-control.socket systemd-udev-kernel.socket
+Restart=on-failure
+ExecStart=@rootlibexecdir@/systemd-udevd

diff --git a/units/udev-control.socket b/units/udev-control.socket
deleted file mode 100644 (file)
index f80f774..0000000
--- a/units/udev-control.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=udev Control Socket
-DefaultDependencies=no
-ConditionCapability=CAP_MKNOD
-
-[Socket]
-Service=udev.service
-ListenSequentialPacket=/run/udev/control
-SocketMode=0600
-PassCredentials=yes

diff --git a/units/udev-kernel.socket b/units/udev-kernel.socket
deleted file mode 100644 (file)
index 23fa9d5..0000000
--- a/units/udev-kernel.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=udev Kernel Socket
-DefaultDependencies=no
-ConditionCapability=CAP_MKNOD
-
-[Socket]
-Service=udev.service
-ReceiveBuffer=134217728
-ListenNetlink=kobject-uevent 1
-PassCredentials=yes

diff --git a/units/udev-settle.service.in b/units/udev-settle.service.in
deleted file mode 100644 (file)
index 0a5e8c5..0000000
--- a/units/udev-settle.service.in
+++ /dev/null
@@ -1,26 +0,0 @@
-# This service is usually not enabled by default. If enabled, it
-# acts as a barrier for basic.target -- so all later services will
-# wait for udev completely finishing its coldplug run.
-#
-# If needed, to work around broken or non-hotplug-aware services,
-# it might be enabled unconditionally, or pulled-in on-demand by
-# the services that assume a fully populated /dev at startup. It
-# should not be used or pulled-in ever on systems without such
-# legacy services running.
-
-[Unit]
-Description=udev Wait for Complete Device Initialization
-DefaultDependencies=no
-Wants=udev.service
-After=udev-trigger.service
-Before=basic.target
-ConditionCapability=CAP_MKNOD
-
-[Service]
-Type=oneshot
-TimeoutSec=180
-RemainAfterExit=yes
-ExecStart=@bindir@/udevadm settle
-
-[Install]
-WantedBy=basic.target

diff --git a/units/udev-trigger.service.in b/units/udev-trigger.service.in
deleted file mode 100644 (file)
index ce937ae..0000000
--- a/units/udev-trigger.service.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=udev Coldplug all Devices
-Wants=udev.service
-After=udev-kernel.socket udev-control.socket
-DefaultDependencies=no
-ConditionCapability=CAP_MKNOD
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=@bindir@/udevadm trigger --type=subsystems --action=add ; @bindir@/udevadm trigger --type=devices --action=add

diff --git a/units/udev.service.in b/units/udev.service.in
deleted file mode 100644 (file)
index 7336e0e..0000000
--- a/units/udev.service.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=udev Kernel Device Manager
-Wants=udev-control.socket udev-kernel.socket
-After=udev-control.socket udev-kernel.socket
-Before=basic.target
-DefaultDependencies=no
-ConditionCapability=CAP_MKNOD
-
-[Service]
-Type=notify
-OOMScoreAdjust=-1000
-Sockets=udev-control.socket udev-kernel.socket
-Restart=on-failure
-ExecStart=@udevlibexecdir@/udevd