- udev services have been renamed to systemd-udev

Changed files:
    network.service -> 1.10
    pld-wait-storage.service -> 1.2
    systemd.spec -> 1.167

diff --git a/network.service b/network.service
index f281df090ab10835a8cee2eeb417ffe60bd967f5..b9311a7a4ee8f544878a8bf7e7a5f71127c3bfcb 100644 (file)
--- a/network.service
+++ b/network.service
@@ -1,9 +1,9 @@
 [Unit]
 Description=Initialize network
 DefaultDependencies=no
-After=syslog.target udev-settle.service
+After=syslog.target systemd-udev-settle.service
 After=systemd-tmpfiles-setup.service
-Wants=network.target udev.service udev-settle.service
+Wants=network.target systemd-udev.service systemd-udev-settle.service
 Wants=local-fs.target
 Before=network.target
 

diff --git a/pld-wait-storage.service b/pld-wait-storage.service
index fb534966f96c6d25cd65ddd47f5929181f79cb17..5443d6938cc0c5df3b2dee2dde66eb08aacc57be 100644 (file)
--- a/pld-wait-storage.service
+++ b/pld-wait-storage.service
@@ -2,9 +2,9 @@
 Description=Wait for storage scan
 DefaultDependencies=no
 Conflicts=shutdown.target
-After=udev-settle.service
+After=systemd-udev-settle.service
 Before=local-fs.target shutdown.target
-Wants=udev.service udev-settle.service
+Wants=systemd-udev.service systemd-udev-settle.service
 
 [Service]
 ExecStart=-/sbin/rmmod scsi_wait_scan

diff --git a/systemd.spec b/systemd.spec
index 769d705df163f07a879d4500ec0bedb7f0336b1e..c0b74de293df35a1683f34a53d4a3ddf07874a48 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -854,24 +854,24 @@ fi
 /sbin/udevadm info --convert-db
 
 %triggerpostun -n udev-core -- %{name}-core < 1:175-4
-%systemd_trigger udev-settle.service
+%systemd_trigger systemd-udev-settle.service
 
 %post -n udev-core
 if [ $1 -gt 1 ]; then
        if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
                if grep -qs devtmpfs /proc/mounts && [ -n "$(pidof udevd)" ]; then
                        /sbin/udevadm control --exit
-                       /lib/udev/udevd --daemon
+                       /lib/systemd/systemd-udevd --daemon
                fi
        else
                SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
-               /bin/systemctl --quiet try-restart udev.service || :
+               /bin/systemctl --quiet try-restart systemd-udev.service || :
        fi
 fi
-%systemd_post udev-settle.service
+%systemd_post systemd-udev-settle.service
 
 %preun -n udev-core
-%systemd_preun udev-settle.service
+%systemd_preun systemd-udev-settle.service
 
 %postun -n udev-core
 %systemd_reload