[SCM] Debian Live initramfs hook branch, master, updated. 1.156.1-1-13-g34ab13d

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 34ab13d8d9e1f7ec3ca95757a95b7a2a9e8f3925
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Mar 12 11:11:53 2009 +0100

    Correcting check for usb when using removable-usb keyword.

diff --git a/scripts/live b/scripts/live
index d125eae..ef7f64d 100755
--- a/scripts/live
+++ b/scripts/live
@@ -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

-- 
Debian Live initramfs hook