[patch] both fixes, and better check for disk

genkernel-3.4.10-liveusb-partition.patch (text/plain), 793 bytes, created by devsk on 2008-03-09 06:34:32 UTC

--- initrd.scripts.org	2008-03-08 22:33:28.000000000 -0800
+++ initrd.scripts	2008-03-08 22:31:30.000000000 -0800
@@ -92,6 +92,12 @@
 			# Check for a block device to mount
 			if [ -b "${x}" ]
 			then
+				# if disk and it has at least one partition, skip.
+				bsn=`basename "${x}"`
+				if [ -e "/sys/block/${bsn}" -a -b "${x}1" ]
+				then
+					continue
+				fi
 				good_msg "Attempting to mount media:- ${x}" ${CRYPT_SILENT}
 
 #				if [ "${media}" = "cdrom" ]; then
@@ -281,10 +287,11 @@
 }
 
 test_success() {
+	retcode=$?
 	error_string=$1
 	error_string="${error_string:-run command}"
 	# If last command failed send error message and fall back to a shell	
-	if [ "$?" != '0' ]
+	if [ "$retcode" != '0' ]
 	then
 		bad_msg 'Failed to $1; failing back to the shell...'
 		run_shell