summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Bächler <thomas@archlinux.org>2010-01-10 17:49:41 +0100
committerThomas Bächler <thomas@archlinux.org>2010-01-10 17:49:41 +0100
commit2c5cab626d28078c3947a2883864e1c93e5b24c0 (patch)
tree8d115cc7c2680f5e9b28bd3757b2cc8a01443dd5
parenta1d8b8d5ed63f78346ed4430c7fae3f4711f0782 (diff)
downloadmkinitcpio-2c5cab626d28078c3947a2883864e1c93e5b24c0.tar.gz
mkinitcpio-2c5cab626d28078c3947a2883864e1c93e5b24c0.tar.xz
Remove klibc-isms from autodetect: Use blkid for filesystem detection
-rw-r--r--install/autodetect5
1 files changed, 1 insertions, 4 deletions
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
}