udevd moved to /lib/systemd/systemd-udevd

diff --git a/dracut.conf.d/fedora.conf.example b/dracut.conf.d/fedora.conf.example
index 02a530e5f313e744b196d1c852868443eee0ff25..617d96731c2b128226a889cbaae62903bd1c639c 100644 (file)
--- a/dracut.conf.d/fedora.conf.example
+++ b/dracut.conf.d/fedora.conf.example
@@ -8,3 +8,4 @@ omit_drivers+=" .*/fs/ocfs/.* "
 stdloglvl=3
 realinitpath="/usr/lib/systemd/systemd"
 install_items+=" vi /etc/virc ps grep cat rm "
+prefix="/"

diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
index b17232f13f5f8507a262da97635a9d1f0656cc16..cc42eb769142b4bfa445387be1960b836d3e246f 100755 (executable)
--- a/modules.d/95udev-rules/module-setup.sh
+++ b/modules.d/95udev-rules/module-setup.sh
@@ -8,12 +8,20 @@ install() {
     # ultimately, /lib/initramfs/rules.d or somesuch which includes links/copies
     # of the rules we want so that we just copy those in would be best
     dracut_install udevadm
-    [ -x /sbin/udevd ] && dracut_install udevd
+    if [ -x /sbin/udevd ]; then
+        dracut_install udevd
+        mkdir -p ${initdir}/lib/systemd
+        ln -s /sbin/udevd ${initdir}/lib/systemd/systemd-udevd
+    elif [ -x /lib/systemd/systemd-udevd ]; then
+        inst /lib/systemd/systemd-udevd
+    fi
 
     for i in /etc/udev/udev.conf /etc/group; do
         inst_simple $i
     done
+
     dracut_install basename
+
     inst_rules 50-udev-default.rules 60-persistent-storage.rules \
         61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules \
         60-pcmcia.rules

diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
index 2f87a2051c9d44ccaf3206c89f8687f2f541297b..0ea72e80f22619a714ae19f994902bda881bbc8f 100755 (executable)
--- a/modules.d/99base/init.sh
+++ b/modules.d/99base/init.sh
@@ -110,7 +110,7 @@ getarg 'rd.break=pre-udev' 'rdbreak=pre-udev' && emergency_shell -n pre-udev "Br
 source_hook pre-udev
 
 # start up udev and trigger cold plugs
-udevd --daemon --resolve-names=never
+/lib/systemd/systemd-udevd --daemon --resolve-names=never
 
 UDEV_LOG_PRIO_ARG=--log-priority
 UDEV_QUEUE_EMPTY="udevadm settle --timeout=0"