From ee93d17783dc32d03faf99c29bdcd4fcc30abc43 Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Wed, 4 Jul 2007 10:15:53 +0200
Subject: scripts/local: make sure that fstype is always invoked

---
 scripts/local | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/local b/scripts/local
index b06ca63..55d4c46 100644
--- a/scripts/local
+++ b/scripts/local
@@ -8,10 +8,10 @@ get_fstype ()
 	local FS FSTYPE FSSIZE RET
 	FS="${1}"
 
-	# vol_id has a more complete list of file systems
-	if [ -x /lib/udev/vol_id ]; then
-		eval $(fstype "${FS}" 2> /dev/null)
-	else
+	# 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
 		FSTYPE=$(/lib/udev/vol_id -t "${FS}" 2> /dev/null)
 	fi
 	RET=$?
-- 
cgit v1.2.3