[SCM] live-boot branch, debian-next, updated. debian/3.0_a26-1-33-g8544e4c

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 8544e4c311588479702ce6ac22775129557f8a4f
Author: Ian Reinhart Geiser <geiseri at yahoo.com>
Date:   Mon Apr 30 17:46:48 2012 +0000

    For some reason \< and \> do not match the ends of words in busybox when checking if a device is blacklisted, changing this to the ^ and $.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 1414156..f604cc4 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -449,9 +449,9 @@ storage_devices()
 	do
 		fulldevname=$(sys2dev "${sysblock}")
 
-		if echo "${black_listed_devices}" | grep -qe "\<${fulldevname}\>" || \
+		if echo "${black_listed_devices}" | grep -qe "^${fulldevname}$" || \
 			[ -n "${white_listed_devices}" ] && \
-			echo "${white_listed_devices}" | grep -qve "\<${fulldevname}\>"
+			echo "${white_listed_devices}" | grep -qve "^${fulldevname}$"
 		then
 			# skip this device entirely
 			continue
@@ -461,7 +461,7 @@ storage_devices()
 		do
 			devname=$(sys2dev "${dev}")
 
-			if echo "${black_listed_devices}" | grep -qe "\<${devname}\>"
+			if echo "${black_listed_devices}" | grep -qe "^${devname}$"
 			then
 				# skip this subdevice
 				continue

-- 
live-boot