systemd: remove old udev services

diff --git a/modules.d/98systemd/dracut-initqueue.service b/modules.d/98systemd/dracut-initqueue.service
index 4f86eafa4ba4599f22b0e75b5d1db467e32661d0..31fe9e42d1ce45574e3ef1deb8ee2c56bb5522fb 100644 (file)
--- a/modules.d/98systemd/dracut-initqueue.service
+++ b/modules.d/98systemd/dracut-initqueue.service
@@ -10,8 +10,8 @@
 [Unit]
 Description=Dracut initqueue hook
 DefaultDependencies=no
-After=systemd-udev-trigger.service udev-trigger.service
-Wants=systemd-udev-trigger.service udev-trigger.service
+After=systemd-udev-trigger.service
+Wants=systemd-udev-trigger.service
 
 [Service]
 Environment=HOME=/

diff --git a/modules.d/98systemd/dracut-pre-trigger.service b/modules.d/98systemd/dracut-pre-trigger.service
index 234839c6f38aa970073e92ab0fe5e0a1df75744c..b06d17f3f457885dff642ca973e9e6520f997b50 100644 (file)
--- a/modules.d/98systemd/dracut-pre-trigger.service
+++ b/modules.d/98systemd/dracut-pre-trigger.service
@@ -10,9 +10,9 @@
 [Unit]
 Description=Dracut pre-trigger hook
 DefaultDependencies=no
-Before=systemd-udev-trigger.service udev-trigger.service dracut-initqueue.service
-After=dracut-pre-udev.service systemd-udev.service udev.service
-Wants=dracut-pre-udev.service systemd-udev.service udev.service
+Before=systemd-udev-trigger.service dracut-initqueue.service
+After=dracut-pre-udev.service systemd-udev.service
+Wants=dracut-pre-udev.service systemd-udev.service
 
 [Service]
 Environment=HOME=/

diff --git a/modules.d/98systemd/dracut-pre-udev.service b/modules.d/98systemd/dracut-pre-udev.service
index 11be61b4537e62f56ec354beeaf28fecdf2282a8..d867b3840c97728af23fc1c90f2155d24d47014c 100644 (file)
--- a/modules.d/98systemd/dracut-pre-udev.service
+++ b/modules.d/98systemd/dracut-pre-udev.service
@@ -10,7 +10,7 @@
 [Unit]
 Description=Dracut pre-udev hook
 DefaultDependencies=no
-Before=systemd-udev.service udev.service dracut-pre-trigger.service
+Before=systemd-udev.service dracut-pre-trigger.service
 After=dracut-cmdline.service
 Wants=dracut-cmdline.service
 

diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh
index 4c68a9ac0900287a6b75436453453a5815cf4f7e..a6e236569d554444ee8d4afdc69896e6d4b06993 100755 (executable)
--- a/modules.d/98systemd/module-setup.sh
+++ b/modules.d/98systemd/module-setup.sh
@@ -85,16 +85,7 @@ install() {
         $systemdsystemunitdir/syslog.target \
         $systemdsystemunitdir/initrd-switch-root.target \
         $systemdsystemunitdir/initrd-switch-root.service \
-        $systemdsystemunitdir/umount.target \
-        $systemdsystemunitdir/udev-control.socket \
-        $systemdsystemunitdir/udev-kernel.socket \
-        $systemdsystemunitdir/udev.service \
-        $systemdsystemunitdir/udev-settle.service \
-        $systemdsystemunitdir/udev-trigger.service \
-        $systemdsystemunitdir/basic.target.wants/udev.service \
-        $systemdsystemunitdir/basic.target.wants/udev-trigger.service \
-        $systemdsystemunitdir/sockets.target.wants/udev-control.socket \
-        $systemdsystemunitdir/sockets.target.wants/udev-kernel.socket
+        $systemdsystemunitdir/umount.target
 
     for i in /etc/systemd/*.conf; do
         dracut_install "$i"