Clean up init - chunks in base and filesystem hooks

git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@13 880c04e9-e011-0410-abf7-b926e227c9cd

1 files changed, 4 insertions, 25 deletions

diff --git a/init b/init
index 72452c1..4508f01 100644
--- a/init
+++ b/init
@@ -17,11 +17,6 @@ for cmd in $CMDLINE; do
     esac
 done
 
-#this should be part of the 'base' hook
-msg -n "Loading pci modules..."
-/bin/modprobe -a -q $(/bin/cat /sys/bus/pci/devices/*/modalias) >/dev/null 2>&1 &
-msg "done."
-
 if [ "x${disablehooks}" != "x" ]; then
     OLDIFS=$IFS
     IFS=,
@@ -33,6 +28,10 @@ fi
 
 . /config
 
+for m in $MODULES; do
+    /bin/modprobe -q $m > /dev/null 2>&1
+done
+
 if [ -e "/hooks" ]; then
     for h in $HOOKS; do
         TST=""
@@ -48,26 +47,6 @@ if [ -e "/hooks" ]; then
     done
 fi
 
-msg -n ":: Loading root filesystem module..."
-if [ "x${rootfstype}" != "x" ]; then
-    FSTYPE="${rootfstype}"
-else
-    if [ "x${root}" != "x" ]; then
-        msg "Attempting mkrootdev ${root}"
-        if /bin/mkrootdev "${root}"; then
-            eval $(/bin/fstype < /dev/root)
-        else
-            FSTYPE="unknown"
-            echo "ERROR: mkrootdev failed. Try passing the rootfstype= parameter to the kernel."
-        fi
-    else
-        FSTYPE="unknown"
-        echo "ERROR: root fs cannot be detected. Use the rootfstype= kernel parameter..."
-    fi
-fi
-msg "fs=${FSTYPE}"
-/bin/modprobe -q "${FSTYPE}" 2>&1 >/dev/null
-
 if [ "${break}" = "y" ]; then
     echo ":: Break requested, type 'exit' to resume operation"
     PS1="ramfs$ " /bin/sh -i