[SCM] live-boot branch, debian-next, updated. debian/3.0_a8-1-4-g3ab05a0

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 247983726deec304e3853ff9b052c631084cc350
Author: T(A)ILS developers <amnesia at boum.org>
Date:   Sat Oct 23 12:14:32 2010 +0200

    Fixing overzealous blacklist usage.
    
    Previous blacklist checking was a bit overzealous: e.g. if /dev/sdb1 was
    blacklisted (e.g. because it would contain the system-wide persistence COW
    device), any other device whose name contains the blacklist one, such as
    /dev/sdb11, was also be blacklisted.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 2719eea..0e9b0d0 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -301,7 +301,7 @@ find_cow_device ()
 		do
 			devname=$(sys2dev "${dev}")
 
-			if echo "${black_listed_devices}" | grep -q "${devname}"
+			if echo "${black_listed_devices}" | grep -q -w "${devname}"
 			then
 				# skip this device enterely
 				break
@@ -388,7 +388,7 @@ find_files ()
 			devname=$(sys2dev "${dev}")
 			devfstype="$(get_fstype ${devname})"
 
-			if echo "${black_listed_devices}" | grep -q "${devname}"
+			if echo "${black_listed_devices}" | grep -q -w "${devname}"
 			then
 				# skip this device enterely
 				break

-- 
live-boot