From 454a73ce6394830923bc54b584d33edf0e6918b1 Mon Sep 17 00:00:00 2001 From: "T(A)ILS developers" Date: Sat, 23 Oct 2010 12:14:32 +0200 Subject: 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. --- scripts/live-helpers | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') 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 -- cgit v1.2.3