[SCM] live-boot branch, debian-next, updated. debian/3.0_a6-1-1-g1e2bc52

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 1e2bc520aba657e844dbfff054b161091e6e870c
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Sep 25 22:43:33 2010 +0200

    Fixing find_snap to take its second argument into account.

diff --git a/scripts/live b/scripts/live
index 18881af..ad2d48e 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1005,16 +1005,17 @@ find_snap ()
 {
 	# Look for ${snap_label}.* in block devices
 	snap_label="${1}"
+	black_listed_devices="${2}"
 
 	if [ "${PERSISTENT}" != "nofiles" ]
 	then
 		# search for image files
-		snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2")
+		snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2" "${black_listed_devices}")
 	fi
 
 	if [ -z "${snapdata}" ]
 	then
-		snapdata=$(find_cow_device "${snap_label}")
+		snapdata=$(find_cow_device "${snap_label}" "${black_listed_devices}")
 	fi
 	echo "${snapdata}"
 }

-- 
live-boot