summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2008-12-30 01:53:06 +0100
committerAaron Griffin <aaronmgriffin@gmail.com>2008-12-30 01:53:06 +0100
commitc1142ef7854f4a974e6a553ad6fff467a89f7312 (patch)
tree0a5fe4094d52239e3d09112ae3d28d4e668d839d
parenta702232c51e5d814ec26e1ad9ba518f04a4ac5f3 (diff)
downloadmkinitcpio-c1142ef7854f4a974e6a553ad6fff467a89f7312.tar.gz
mkinitcpio-c1142ef7854f4a974e6a553ad6fff467a89f7312.tar.xz
Revert fstype -> blkid change0.5.20
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>
-rw-r--r--install/autodetect2
1 files changed, 1 insertions, 1 deletions
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