[SCM] live-boot branch, debian-next, updated. debian/3.0_a10-1-2-gcf5a1d2

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit cf5a1d2db470818386314a9f1752264e83077592
Author: T(A)ILS developers <amnesia at boum.org>
Date:   Wed Oct 20 18:33:12 2010 +0200

    Enhancing devices search ordering.
    
    E.g. prefer mounting /dev/sdb1 rather than /dev/sdb.
    
    The isohybrid feature makes both valid devices for being searched for a live
    filesystem image. Previous code mounted /dev/sdb on /live/image which makes it
    hard to create a second partition on the USB stick.
    
    This brings the need to explicitly check whether the full device is in the
    blacklist before even considering its subdevices: the previous blacklist
    checking code worked because the full device was always considered before its
    subdevices, which is not true anymore.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 0e9b0d0..b1883ff 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -26,7 +26,7 @@ subdevices ()
 	sysblock=${1}
 	r=""
 
-	for dev in "${sysblock}" "${sysblock}"/*
+	for dev in "${sysblock}"/* "${sysblock}"
 	do
 		if [ -e "${dev}/dev" ]
 		then
@@ -297,13 +297,21 @@ find_cow_device ()
 
 	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
 	do
+		fulldevname=$(sys2dev "${sysblock}")
+
+		if echo "${black_listed_devices}" | grep -q -w "${fulldevname}"
+		then
+			# skip this device entirely
+			break
+		fi
+
 		for dev in $(subdevices "${sysblock}")
 		do
 			devname=$(sys2dev "${dev}")
 
 			if echo "${black_listed_devices}" | grep -q -w "${devname}"
 			then
-				# skip this device enterely
+				# skip this subdevice
 				break
 			fi
 
@@ -383,6 +391,14 @@ find_files ()
 
 	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
 	do
+		fulldevname=$(sys2dev "${sysblock}")
+
+		if echo "${black_listed_devices}" | grep -q -w "${fulldevname}"
+		then
+			# skip this device entirely
+			break
+		fi
+
 		for dev in $(subdevices "${sysblock}")
 		do
 			devname=$(sys2dev "${dev}")
@@ -390,7 +406,7 @@ find_files ()
 
 			if echo "${black_listed_devices}" | grep -q -w "${devname}"
 			then
-				# skip this device enterely
+				# skip this subdevice
 				break
 			fi
 

-- 
live-boot