From 9c105f0a0ff9a794e10d511ca738c253e3d1f4a5 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 20 Jan 2016 23:59:20 +0000
Subject: Assume blkid is always installed, and remove fallbacks

udev has used blkid since version 142, so we can rely on it being
present at build and boot time.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 scripts/functions | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'scripts')

diff --git a/scripts/functions b/scripts/functions
index 930a12c..2c36ed2 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -143,10 +143,8 @@ get_fstype ()
 	# but fstype is more robust
 	FSTYPE="unknown"
 	eval $(fstype "${FS}" 2> /dev/null)
-	if [ "$FSTYPE" = "unknown" ] &&  command -v blkid >/dev/null 2>&1 ; then
+	if [ "$FSTYPE" = "unknown" ]; 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=$?
 
@@ -299,12 +297,7 @@ resolve_device() {
 
 	case "$DEV" in
 	LABEL=* | UUID=* | PARTLABEL=* | PARTUUID=*)
-		if command -v blkid >/dev/null 2>&1; then
-			DEV="$(blkid -l -t "$DEV" -o device)" || return 1
-		else
-			log_warning_msg "blkid not present, so cannot resolve $DEV"
-			return 1
-		fi
+		DEV="$(blkid -l -t "$DEV" -o device)" || return 1
 		;;
 	esac
 	[ -e "$DEV" ] && echo "$DEV"
-- 
cgit v1.2.3