From: T(A)ILS developers <amnesia@boum.org>
Date: Sat, 23 Oct 2010 10:14:32 +0000 (+0200)
Subject: Fixing overzealous blacklist usage.
X-Git-Tag: debian/2.0.9-1~2
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=34f3c0791bdffd64a3b7d4167882a5d308c6292c

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 314c33f..47674e6 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -309,7 +309,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
@@ -408,7 +408,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