From 247983726deec304e3853ff9b052c631084cc350 Mon Sep 17 00:00:00 2001 From: "T(A)ILS developers" Date: Sat, 23 Oct 2010 12:14:32 +0200 Subject: [PATCH] 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(-) 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 -- 2.1.4