From 2f7a21aaf71ba7b603666de181586bb7453bbf10 Mon Sep 17 00:00:00 2001
From: Thomas Bächler <thomas@archlinux.org>
Date: Sat, 6 Jun 2009 22:56:12 +0200
Subject: Remove the filesystems runtime hook: Detection is done by kinit,
 don't duplicate code here

---
 hooks/filesystems   | 46 ----------------------------------------------
 install/filesystems |  7 +++----
 2 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 hooks/filesystems

diff --git a/hooks/filesystems b/hooks/filesystems
deleted file mode 100644
index 306277b..0000000
--- a/hooks/filesystems
+++ /dev/null
@@ -1,46 +0,0 @@
-# vim: set ft=sh:
-run_hook ()
-{
-    msg -n ":: Loading root filesystem module..."
-    if [ -n "${rootfstype}" ]; then
-        FSTYPE="${rootfstype}"
-    else
-        if [ ! -e "${root}" ]; then
-            msg "\nAttempting to create root device '${root}'"
-
-            if [ -n "${rootdelay}" ]; then
-                msg -n "Waiting for devices to settle..."
-                /bin/sleep "${rootdelay}"
-                msg "done."
-                export rootdelay=0
-            fi
-
-            eval $(/bin/parseblock "${root}")
-            if [ "${BLOCKNAME}" = "unknown" ]; then
-                FSTYPE="unknown"
-                echo "ERROR: Failed to parse block device name for '${root}'"
-            elif [ -z "${BLOCKDEVICE}" ]; then
-                FSTYPE="unknown"
-                echo "ERROR: Failed to parse block device ids for '${root}'"
-            else
-                export root="${BLOCKNAME}"
-                echo "/bin/mknod \"${BLOCKNAME}\" b ${BLOCKDEVICE}"
-                /bin/mknod "${BLOCKNAME}" b ${BLOCKDEVICE} >/dev/null
-            fi
-        fi
-
-        if [ -e "${root}" ]; then
-            eval $( /bin/fstype < "${root}" )
-        else
-            FSTYPE="unknown"
-        fi
-
-    fi
-    msg "   ${FSTYPE}"
-    if [ "${FSTYPE}" = "unknown" ]; then
-        echo "ERROR: root fs cannot be detected. Try using the rootfstype= kernel parameter."
-    else
-        kinit_params="${kinit_params} rootfstype=${FSTYPE}"
-        /sbin/modprobe -q "${FSTYPE}" >/dev/null 2>&1
-    fi
-}
diff --git a/install/filesystems b/install/filesystems
index 67ab1a2..7761fdc 100644
--- a/install/filesystems
+++ b/install/filesystems
@@ -5,14 +5,13 @@ install ()
     MODULES=" $(checked_modules '/kernel/fs' | grep -v "nls") $(checked_modules '/kernel/fs/nls/nls_cp437')"
     BINARIES=""
     FILES=""
-    SCRIPT="filesystems"
+    SCRIPT=""
 }
 
 help ()
 {
 cat<<HELPEOF
-  This hook is responsible for loading filesystems for the root device.
-  Detection will be done at runtime.  If you would like to minimize the
-  modules installed in the image, add the autodetect hook too.
+  This hook adds filesystems modules to the image. If you would like to
+  minimize the modules installed in the image, add the autodetect hook too.
 HELPEOF
 }
-- 
cgit v1.2.3-24-g4f1b