From 52dcef518bdb95605670b8dc12257057bf7a2dc0 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Tue, 10 Aug 2010 01:57:53 +0200
Subject: Adding debian version 3.0~a1-1.

---
 scripts/live-helpers | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

(limited to 'scripts/live-helpers')

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 47674e6..2719eea 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -76,15 +76,7 @@ is_supported_fs ()
 
 get_fstype ()
 {
-	# udev (>= 146) no longer provides vol_id
-	if [ -x /lib/udev/vol_id ]
-	then
-		# lenny
-		/lib/udev/vol_id -t ${1} 2>/dev/null
-	else
-		# squeeze
-		/sbin/blkid -s TYPE -o value $1 2>/dev/null
-	fi
+	/sbin/blkid -s TYPE -o value $1 2>/dev/null
 }
 
 where_is_mounted ()
@@ -309,7 +301,7 @@ find_cow_device ()
 		do
 			devname=$(sys2dev "${dev}")
 
-			if echo "${black_listed_devices}" | grep -q -w "${devname}"
+			if echo "${black_listed_devices}" | grep -q "${devname}"
 			then
 				# skip this device enterely
 				break
@@ -345,22 +337,10 @@ find_cow_device ()
 				done
 			fi
 
-			# udev (>= 146) no longer provides vol_id
-			if [ -x /lib/udev/vol_id ]
+			if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
 			then
-				# lenny
-				if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
-				then
-					echo "${devname}"
-					return 0
-				fi
-			else
-				# squeeze
-				if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
-				then
-					echo "${devname}"
-					return 0
-				fi
+				echo "${devname}"
+				return 0
 			fi
 
 			if [ "${PERSISTENT}" = "nofiles" ]
@@ -408,7 +388,7 @@ find_files ()
 			devname=$(sys2dev "${dev}")
 			devfstype="$(get_fstype ${devname})"
 
-			if echo "${black_listed_devices}" | grep -q -w "${devname}"
+			if echo "${black_listed_devices}" | grep -q "${devname}"
 			then
 				# skip this device enterely
 				break
-- 
cgit v1.2.3