From 2c5cab626d28078c3947a2883864e1c93e5b24c0 Mon Sep 17 00:00:00 2001
From: Thomas Bächler <thomas@archlinux.org>
Date: Sun, 10 Jan 2010 17:49:41 +0100
Subject: Remove klibc-isms from autodetect: Use blkid for filesystem detection

---
 install/autodetect | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'install')

diff --git a/install/autodetect b/install/autodetect
index b3e6b90..0010da3 100644
--- a/install/autodetect
+++ b/install/autodetect
@@ -14,10 +14,7 @@ install ()
     findfs ()
     {
         for blkdev in $(find /dev -type b | grep -v -e /dev/loop -e /dev/ram -e /dev/fd); do
-            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
+            (eval $(/sbin/blkid -o udev -p "${blkdev}"); [ "${ID_FS_USAGE}" = "filesystem" ] && echo $ID_FS_TYPE)
         done
     }
 
-- 
cgit v1.2.3-24-g4f1b