[Debian-live-changes] r1986 - dists/trunk/live-initramfs/scripts

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-08 08:31:22 +0000 (Fri, 08 Jun 2007)
New Revision: 1986

Modified:
   dists/trunk/live-initramfs/scripts/live-helpers
Log:


Modified: dists/trunk/live-initramfs/scripts/live-helpers
===================================================================
--- dists/trunk/live-initramfs/scripts/live-helpers	2007-06-08 08:08:02 UTC (rev 1985)
+++ dists/trunk/live-initramfs/scripts/live-helpers	2007-06-08 08:31:22 UTC (rev 1986)
@@ -126,16 +126,9 @@
     modprobe ${MP_QUIET} -b "$module"
     udevsettle
 
-    if [ "$module" = loop ]; then
-	if [ ! -e /dev/loop0 ]; then
-	    # temporary workaround for kernel bug
-	    for i in 0 1 2 3 4 5 6 7; do
-		mknod "/dev/loop$i" b 7 "$i" || true
-	    done
-	fi
-
-	dev="$(losetup -f)"
-	if [ "$dev" ]; then
+    for loopdev in $pattern; do
+        if [ "$(cat $loopdev/size)" -eq 0 ]; then
+            dev=$(sys2dev "${loopdev}")
             options=''
             if [ 0 -lt "${offset}" ]; then
                 options="${options} -o ${offset}"
@@ -168,49 +161,9 @@
             fi
             echo "$dev"
             return 0
-	else
-		panic "No loop devices available"
         fi
-    else
-	for loopdev in $pattern; do
-	    if [ "$(cat $loopdev/size)" -eq 0 ]; then
-		dev=$(sys2dev "${loopdev}")
-		options=''
-		if [ 0 -lt "${offset}" ]; then
-		    options="${options} -o ${offset}"
-		fi
-		if [ -z "${encryption}" ]; then
-		    losetup ${options} "${dev}" "${fspath}"
-		else
-		    # Loop AES encryption
-		    while true; do
-		        load_keymap
-			echo -n "Enter passphrase for ${fspath}: " >&6
-			read -s passphrase
-			echo "${passphrase}" > /tmp/passphrase
-			exec 9</tmp/passphrase
-			/sbin/losetup ${options} -e "${encryption}" -p 9 "${dev}" "${fspath}"
-			error=$?
-			exec 9<&-
-			rm -f /tmp/passphrase
-			if [ 0 -eq ${error} ]; then
-			    unset error
-			    break
-			fi
-			echo -n "Something went wrong... Retry? [YES/no] " >&6
-			read answer
-			if [ 'no' = "${answer}" ]; then
-			    unset answer
-			    break
-			fi
-		    done
-		fi
-		echo "$dev"
-		return 0
-	    fi
-	done
-	panic "No loop devices available"
-    fi
+    done
+    panic "No loop devices available"
 }
 
 try_mount ()