Index: genkernel/trunk/generic/initrd.scripts
===================================================================
--- genkernel/trunk/generic/initrd.scripts	(revision 518)
+++ genkernel/trunk/generic/initrd.scripts	(working copy)
@@ -111,11 +111,10 @@
                                 good_msg "Attempting to mount key media:- ${x}"
                                 mount -r -t auto ${x} ${NEW_ROOT}/mnt/key \
                                                 > /dev/null 2>&1
-                                fi
                                 if [ "$?" = '0' ]
                                 then
                                         # Check for the key
-                                        if [ -e ${NEW_ROOT}/mnt/key/${SUBDIR}/${KEYNAME} ]
+                                        if [ -e ${NEW_ROOT}/mnt/key/${KEYNAME} ]
                                         then
                                                 KEY_ROOT="${x}"
                                                 break
@@ -401,7 +400,7 @@
         # USB using the USB Block Driver
         KEYDEVS="${KEYDEVS} /dev/ubd* /dev/ubd/*"
         # iSeries devices
-        KEYDEVS="${KEYDEVs} /dev/iseries/vcd*"
+        KEYDEVS="${KEYDEVS} /dev/iseries/vcd*"
 
         findkeymount ${KEYDEVS}
 }
Index: genkernel/trunk/generic/linuxrc
===================================================================
--- genkernel/trunk/generic/linuxrc	(revision 518)
+++ genkernel/trunk/generic/linuxrc	(working copy)
@@ -499,29 +499,31 @@
 	if [ "${LOOP_CRYPT}" != '' ] 
 	then
 		good_msg 'You booted an encrypted livecd'
-		KEYNAME=$(head -n 1 ${NEW_ROOT}/mnt/cdrom/livecd)
+		KEYNAME="$(head -n 1 ${NEW_ROOT}/mnt/cdrom/livecd)"
 
 		if [ "${KEYNAME}" = '' ]
 		then 
-			good_msg 'It's not locked with a gpg key, attempting to decrypt manually'
+			good_msg 'It's not locked with a key, attempting to decrypt manually'
 			losetup -e ${LOOP_CRYPT} /dev/loop1 ${NEW_ROOT}/mnt/cdrom/${LOOPEXT}${LOOP}
 			
 
 		else 
-			good_msg 'Livecd locked with gpg key'
+			good_msg 'Livecd locked with key'
 			bootstrapKey
 			good_msg 'Attempting to decrypt with key'
-			losetup -K ${NEW_ROOT}/mnt/key/${SUBDIR}/${KEYNAME} -e ${LOOP_CRYPT} /dev/loop1 \
+			losetup -K ${NEW_ROOT}/mnt/key/${KEYNAME} -e ${LOOP_CRYPT} /dev/loop1 \
 				${NEW_ROOT}/mnt/cdrom/${LOOPEXT}${LOOP}
 		fi
 
 		test_success 'Unencrypting loop'
 		
-		case ${LOOPTYPE} in
+		case "${LOOPTYPE}" in
 			squashfs)
 				MOUNTTYPE="squashfs"
+				;;
 			normal)
 				MOUNTTYPE="ext2"
+				;;
 		esac
 
 		mount -t ${MOUNTTYPE} -o ro /dev/loop1 ${NEW_ROOT}/mnt/livecd 
@@ -590,7 +592,7 @@
 			test_success 'mount /dev/loop0 /'
 			FS_LOCATION='mnt/livecd'
 		fi
-	
+	fi
 #
 # End cdrom looptype determination and mounting if necessary
 #