X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=0280eddc8a93d8b14ad2d4f0104ce1e65779fbd0;hb=137f616fb77851cf84c0c2b3f99d77f4337424c4;hp=8db6b8070c3d70921b6c307109272ea04d1bb4d4;hpb=9171ce28fbec2c18a19730044d1ac2157ccb396b;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 8db6b80..0280edd 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1171,7 +1171,7 @@ find_livefs ()
 	fi
 
 	# or do the scan of block devices
-	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram)
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v 'dm-')
 	do
 		devname=$(sys2dev "${sysblock}")
 		fstype=$(get_fstype "${devname}")
@@ -1218,6 +1218,11 @@ set_usplash_timeout ()
 
 mountroot ()
 {
+    
+        if [ -x /scripts/local-top/cryptroot ]; then
+	    /scripts/local-top/cryptroot
+	fi
+
 	exec 6>&1
 	exec 7>&2
 	exec > live.log