From c1142ef7854f4a974e6a553ad6fff467a89f7312 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaronmgriffin@gmail.com>
Date: Mon, 29 Dec 2008 16:53:06 -0800
Subject: Revert fstype -> blkid change

blkid is part of e2fsprogs, not udev, so it's not as
ubiquitous. Additionally, we need to use the same detection
at installtime as we do at runtime.

Thomas has patched klibc's fstype to work with ext4, so we
should continue to use it

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
---
 install/autodetect | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'install')

diff --git a/install/autodetect b/install/autodetect
index ab5118b..d964eef 100644
--- a/install/autodetect
+++ b/install/autodetect
@@ -14,7 +14,7 @@ install ()
     findfs ()
     {
         for blkdev in $(find /dev -type b | grep -v -e loop -e ram -e fd); do
-            FSTYPE="$(/sbin/blkid -o value -s TYPE "${blkdev}")"
+            eval $(/usr/lib/klibc/bin/fstype 2>/dev/null < ${blkdev})
             if [ -n "${FSTYPE}" -a "${FSTYPE}" != "swap" -a "${FSTYPE}" != "unknown" -a "${FSTYPE}" != "luks" -a "${FSTYPE}" != "lvm2" ]; then
                 echo ${FSTYPE}
             fi
-- 
cgit v1.2.3-24-g4f1b