--- dracut-030_git201307241235.orig/dracut.sh
+++ dracut-030_git201307241235/dracut.sh
@@ -643,7 +643,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l
 [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
 [[ $lvmconf_l ]] && lvmconf=$lvmconf_l
 [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
-[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
+[[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware /lib/firmware/$kernel"
 [[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
 [[ $tmpdir ]] || tmpdir=/var/tmp
 [[ $compress_l ]] && compress=$compress_l
--- dracut-030_git201307241235.orig/modules.d/10i18n/module-setup.sh
+++ dracut-030_git201307241235/modules.d/10i18n/module-setup.sh
@@ -94,6 +94,8 @@ install() {
 
     install_base() {
         dracut_install setfont loadkeys kbd_mode stty
+        inst /usr/bin/setfont /bin/setfont
+        inst /usr/bin/loadkeys /bin/loadkeys
 
         if ! dracut_module_included "systemd"; then
             inst ${moddir}/console_init.sh /lib/udev/console_init
--- dracut-030_git201307241235.orig/modules.d/50plymouth/module-setup.sh
+++ dracut-030_git201307241235/modules.d/50plymouth/module-setup.sh
@@ -12,12 +12,12 @@ depends() {
 }
 
 install() {
-    if grep -q nash /usr/libexec/plymouth/plymouth-populate-initrd \
-        || [ ! -x /usr/libexec/plymouth/plymouth-populate-initrd ]; then
+    if grep -q nash /usr/lib/plymouth/plymouth-populate-initrd \
+        || [ ! -x /usr/lib/plymouth/plymouth-populate-initrd ]; then
         . "$moddir"/plymouth-populate-initrd.sh
     else
         PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
-            /usr/libexec/plymouth/plymouth-populate-initrd -t "$initdir"
+            /usr/lib/plymouth/plymouth-populate-initrd -t "$initdir"
     fi
 
     inst_hook emergency 50 "$moddir"/plymouth-emergency.sh
--- dracut-030_git201307241235.orig/modules.d/90kernel-modules/module-setup.sh
+++ dracut-030_git201307241235/modules.d/90kernel-modules/module-setup.sh
@@ -75,7 +75,7 @@ installkernel() {
 }
 
 install() {
-    dracut_install -o /lib/modprobe.d/*.conf
+    dracut_install -o /etc/modprobe.d/*.conf
     [[ $hostonly ]] && dracut_install -o /etc/modprobe.d/*.conf /etc/modprobe.conf
     if ! dracut_module_included "systemd"; then
         inst_hook cmdline 01 "$moddir/parse-kernel.sh"
--- dracut-030_git201307241235.orig/modules.d/95udev-rules/module-setup.sh
+++ dracut-030_git201307241235/modules.d/95udev-rules/module-setup.sh
@@ -11,6 +11,8 @@ install() {
     dracut_install udevadm cat uname blkid \
         /etc/udev/udev.conf
 
+    inst /usr/sbin/blkid /sbin/blkid
+
     [ -d ${initdir}/$systemdutildir ] || mkdir -p ${initdir}/$systemdutildir
     for _i in ${systemdutildir}/systemd-udevd ${udevdir}/udevd /sbin/udevd; do
         [ -x "$_i" ] || continue
--- dracut-030_git201307241235.orig/modules.d/98systemd/rescue.service
+++ dracut-030_git201307241235/modules.d/98systemd/rescue.service
@@ -16,7 +16,7 @@ Environment=HOME=/
 Environment=DRACUT_SYSTEMD=1
 Environment=NEWROOT=/sysroot
 WorkingDirectory=/
-ExecStartPre=-/bin/plymouth quit
+ExecStartPre=-/usr/bin/plymouth quit
 ExecStart=-/bin/sh -i -l
 ExecStopPost=-/bin/rm -f -- /.console_lock
 ExecStopPost=-/usr/bin/systemctl --fail --no-block default