[SCM] live-boot branch, debian-next, updated. debian/3.0_a22-1-25-gf885467

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 59220585ee3ca81a12a56aec64c2313538a8ac79
Author: Tails developers <amnesia at boum.org>
Date:   Tue Nov 8 17:33:46 2011 +0100

    Making sure dm-crypt is loaded when dealing with LUKS devices.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 912d800..484ec93 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -330,6 +330,12 @@ find_cow_device ()
 			# Checking for a luks device
 			if [ "${PERSISTENT_ENCRYPTION}" = "luks" ] && [ -e /sbin/cryptsetup ]
 			then
+				if ! modprobe dm-crypt
+				then
+					log_warning_msg "Unable to load module dm-crypt"
+					continue
+				fi
+
 				if ! /sbin/cryptsetup isLuks ${devname}
 				then
 					# we only look for encrypted subdevices

-- 
live-boot