X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=56c0a1413cdea47a7ba63d4dadcd8db2f6e04e1b;hb=be6b1ff8961f46a2bf51811bdd536c3d90239027;hp=d125eae1e9d1b876ac7cdadcf002b92cb215154b;hpb=3887dbd9d63cf5a694849a4f916eefd2c16057c5;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index d125eae..56c0a14 100755
--- a/scripts/live
+++ b/scripts/live
@@ -944,7 +944,7 @@ try_snap ()
 	snap_mount="${2}"
 	snap_type="${3}"
 
-	if [ ! -z "${snapdata}" ]
+	if [ -n "${snapdata}" ] && [ ! -b "${snapdata}" ]
 	then
 		log_success_msg "found snapshot: ${snapdata}"
 		snapdev="$(echo ${snapdata} | cut -f1 -d ' ')"
@@ -1402,26 +1402,29 @@ find_livefs ()
 
 	# first look at the one specified in the command line
 	case "${LIVE_MEDIA}" in
-		removable)
+		removable-usb)
 			for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
 			do
 				if [ "$(cat ${sysblock}/removable)" = "1" ]
 				then
-					for dev in $(subdevices "${sysblock}")
-					do
-						if check_dev "${dev}"
-						then
-							return 0
-						fi
-					done
+					if readlink ${sysblock}/device | grep -q usb
+					then
+						for dev in $(subdevices "${sysblock}")
+						do
+							if check_dev "${dev}"
+							then
+								return 0
+							fi
+						done
+					fi
 				fi
 			done
 			;;
 
-		removable-usb)
+		removable)
 			for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
 			do
-				if [ "$(cat ${sysblock}/removable)" = "1" ] && readlink ${sysblock}/device | grep -q usb
+				if [ "$(cat ${sysblock}/removable)" = "1" ]
 				then
 					for dev in $(subdevices "${sysblock}")
 					do