X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=ea770f407bd2f2dcf31af7c91d9d6a55ac294518;hb=037b3b3c1fc5a6079b011071b2bb6494249b00fb;hp=332de1019e58e0948f816af97541d1f40fdadd04;hpb=edff8f6f9d2e028e399f055187e4982a73504e62;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 332de10..ea770f4 100755
--- a/scripts/live
+++ b/scripts/live
@@ -60,6 +60,11 @@ Arguments ()
                                 export FETCH
                                 ;;
 
+			hook=*)
+				HOOK="${ARGUMENT#hook=}"
+				export HOOK
+				;;
+
 			hostname=*)
 				HOSTNAME="${ARGUMENT#hostname=}"
 				LIVECONF="changed"
@@ -396,6 +401,11 @@ Arguments ()
 				export XDEBCONF
 				;;
 
+			xdriver=*)
+			        XDRIVER="${ARGUMENT#xdriver=}"
+				export XDRIVER
+				;;
+
 			xvideomode=*)
 				XVIDEOMODE="${ARGUMENT#xvideomode=}"
 				export XVIDEOMODE
@@ -1166,7 +1176,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}")
@@ -1213,6 +1223,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