From cb07072558843db27776a4fa81012c7040d986db Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaron@archlinux.org>
Date: Thu, 4 May 2006 08:20:35 +0000
Subject: Filesystem update - allow a pre-made device node (udev) functions :
 Bugfix grep on checked_modules

git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@58 880c04e9-e011-0410-abf7-b926e227c9cd
---
 hooks/filesystems | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'hooks/filesystems')

diff --git a/hooks/filesystems b/hooks/filesystems
index 0990b4c..4fe655c 100644
--- a/hooks/filesystems
+++ b/hooks/filesystems
@@ -5,18 +5,19 @@ run_hook ()
     if [ "x${rootfstype}" != "x" ]; then
         FSTYPE="${rootfstype}"
     else
-        if [ "x${root}" != "x" ]; then
+        if [ ! -e "${root}" ]; then
             msg "Attempting to create root device '${root}'"
             dev_t=$( /bin/parseblock "${root}" )
             if [ "x${dev_t}" != "x" ]; then
                 /bin/mknod "${root}" b ${dev_t} >/dev/null 2>&1
-                eval $( /bin/fstype < "${root}" )
             else
                 FSTYPE="unknown"
                 echo "ERROR: Failed to parse block device '${root}'"
             fi
-        else
-            FSTYPE="unknown"
+        fi
+        eval $( /bin/fstype < "${root}" )
+
+        if [ "${FSTYPE}" = "unknown" ]; then
             echo "ERROR: root fs cannot be detected. Try using the rootfstype= kernel parameter."
         fi
     fi
-- 
cgit v1.2.3-24-g4f1b