summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am10
-rw-r--r--init/udev.service.in5
-rw-r--r--init/udev.socket8
3 files changed, 10 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am
index 1537d56ebe..16127b722e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,16 +130,20 @@ sharepkgconfig_DATA = udev/udev.pc
if WITH_SYSTEMD
systemdsystemunit_DATA = \
- init/udev.socket \
+ init/udev-control.socket \
+ init/udev-kernel.socket \
init/udev.service \
init/udev-trigger.service \
init/udev-settle.service
-EXTRA_DIST += init/udev.socket
+EXTRA_DIST += \
+ init/udev-control.socket \
+ init/udev-kernel.socket
systemd-install-hook:
mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants
- ln -sf ../udev.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev.socket
+ ln -sf ../udev-control.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev-control.socket
+ ln -sf ../udev-kernel.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev-kernel.socket
mkdir -p $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants
ln -sf ../udev.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev.service
ln -sf ../udev-trigger.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-trigger.service
diff --git a/init/udev.service.in b/init/udev.service.in
index e85974a575..3692fb317e 100644
--- a/init/udev.service.in
+++ b/init/udev.service.in
@@ -1,12 +1,13 @@
[Unit]
Description=udev Kernel Device Manager
-Wants=udev.socket
-After=udev.socket
+Wants=udev-control.socket udev-kernel.socket
+After=udev-control.socket udev-kernel.socket
Before=basic.target
DefaultDependencies=no
[Service]
Type=notify
OOMScoreAdjust=-1000
+Sockets=udev-control.socket udev-kernel.socket
Restart=on-failure
ExecStart=@sbindir@/udevd
diff --git a/init/udev.socket b/init/udev.socket
deleted file mode 100644
index 07fb01c057..0000000000
--- a/init/udev.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=udev Kernel Device Manager Sockets
-DefaultDependencies=no
-
-[Socket]
-ReceiveBuffer=134217728
-ListenSequentialPacket=@/org/kernel/udev/udevd
-ListenNetlink=kobject-uevent 1