summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2008-12-29 22:34:26 +0100
committerAaron Griffin <aaronmgriffin@gmail.com>2008-12-29 22:39:13 +0100
commita3a8464aff3c10d4337e9238629896f2625ac22a (patch)
tree7a6a5b179db05276c234d74a4cce62287a085b8e
parent3d0ab3ac5a02a2b279fee433b5a05485930c2aa8 (diff)
downloadmkinitcpio-a3a8464aff3c10d4337e9238629896f2625ac22a.tar.gz
mkinitcpio-a3a8464aff3c10d4337e9238629896f2625ac22a.tar.xz
Use udev's blkid instead of klibc-extra's fstype
This is better and more updated with regards to figuring out the fs type of a given block device Original-work-by: Gerhard Brauer <gerhard.brauer@web.de> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rw-r--r--install/autodetect2
1 files changed, 1 insertions, 1 deletions
diff --git a/install/autodetect b/install/autodetect
index 1991798..033d741 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
- eval $(/usr/lib/klibc/bin/fstype 2>/dev/null < ${blkdev})
+ FSTYPE="$(/sbin/blkid -o value -s TYPE "${blkdev}")"
if [ -n "${FSTYPE}" -a "${FSTYPE}" != "swap" -a "${FSTYPE}" != "unknown" -a "${FSTYPE}" != "luks" -a "${FSTYPE}" != "lvm2" ]; then
echo ${FSTYPE}
fi