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 (file)
--- 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