[SCM] live-build branch, debian-old-2.0, updated. debian/2.0.10-1-2-gf4dd2e1

[Daniel Baumann]

The following commit has been merged in the debian-old-2.0 branch:
commit f4dd2e10d32c5c00db9dac5629b1fc45feffc74d
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Dec 14 19:57:32 2010 +0100

    Updating losetup-lukshome example hook to use blkid where available, thanks to Clint Adams <clint at gnu.org> (Closes: #607108).

diff --git a/examples/hooks/all_chroot_losetup-lukshome.sh b/examples/hooks/all_chroot_losetup-lukshome.sh
index 95d3c05..b6f33bf 100755
--- a/examples/hooks/all_chroot_losetup-lukshome.sh
+++ b/examples/hooks/all_chroot_losetup-lukshome.sh
@@ -333,27 +333,32 @@ do
 	esac
 done
 
-# search for a partition labeled "lukshome" or $LUKSPART
-for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
-do
-	for dev in $(subdevices "${sysblock}")
+if [ -x /sbin/blkid ]
+then
+	CRYPTHOME=$(/sbin/blkid -L ${LUKSPART})
+else
+	# search for a partition labeled "lukshome" or $LUKSPART
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
 	do
-		devname=$(sys2dev "${dev}")
-		# find partition name and filesystem type
-		if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${LUKSPART}" ]
+		for dev in $(subdevices "${sysblock}")
+		do
+			devname=$(sys2dev "${dev}")
+			# find partition name and filesystem type
+			if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${LUKSPART}" ]
+			then
+				# found one partition with correct label
+				CRYPTHOME="${devname}"
+				# don't search further
+				break
+			fi
+		done
+		# if already found, don't search further
+		if [ -n "${CRYPTHOME}" ]
 		then
-			# found one partition with correct label
-			CRYPTHOME="${devname}"
-			# don't search further
 			break
 		fi
 	done
-	# if already found, don't search further
-	if [ -n "${CRYPTHOME}" ]
-	then
-		break
-	fi
-done
+fi
 
 # if no partition found, exit
 if [ -z "${CRYPTHOME}" ]

-- 
live-build