From 49337bdc94ed5bc176338cfa793a868fcd33784c Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Sat, 30 Jan 2010 19:54:13 +0100
Subject: scripts/local: Use blkid as backup fstype detection

if blkid is on initramfs use it.

Thanks to Joey Hess <joeyh@debian.org> for calling syntax.

Signed-off-by: maximilian attems <maks@debian.org>
---
 scripts/local | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/local b/scripts/local
index 7bc740f..feead1c 100644
--- a/scripts/local
+++ b/scripts/local
@@ -11,7 +11,9 @@ get_fstype ()
 	# vol_id has a more complete list of file systems,
 	# but fstype is more robust
 	eval $(fstype "${FS}" 2> /dev/null)
-	if [ "$FSTYPE" = "unknown" ] && [ -x /lib/udev/vol_id ]; then
+	if [ "$FSTYPE" = "unknown" ] && [ command -v blkid >/dev/null 2>&1 ]; then
+		FSTYPE=$(blkid -o value -s TYPE "${FS}")
+	elif [ "$FSTYPE" = "unknown" ] && [ -x /lib/udev/vol_id ]; then
 		FSTYPE=$(/lib/udev/vol_id -t "${FS}" 2> /dev/null)
 	fi
 	RET=$?
-- 
cgit v1.2.3