--- dracut-037/modules.d/05busybox/module-setup.sh	2014-03-19 16:16:08.000000000 +0000
+++ dracut-037-busybox/modules.d/05busybox/module-setup.sh	2014-03-28 12:38:27.555000000 +0000
@@ -5,6 +5,7 @@
 # called by dracut
 check() {
     require_binaries busybox || return 1
+    [ -e /usr/share/busybox/busybox.links ] || return 1
 
     return 255
 }
@@ -16,21 +17,12 @@
 
 # called by dracut
 install() {
-    local _i _progs _path _busybox
+    local _prog _busybox
     _busybox=$(type -P busybox)
     inst $_busybox /usr/bin/busybox
-    for _i in $($_busybox | sed -ne '1,/Currently/!{s/,//g; s/busybox//g; p}')
+    for _prog in $(< /usr/share/busybox/busybox.links)
     do
-        _progs="$_progs $_i"
-    done
-
-    # FIXME: switch_root should be in the above list, but busybox version hangs
-    # (using busybox-1.15.1-7.fc14.i686 at the time of writing)
-
-    for _i in $_progs; do
-        _path=$(find_binary "$_i")
-        [ -z "$_path" ] && continue
-        ln_r /usr/bin/busybox $_path
+        inst_symlink $_prog
     done
 }