diff options
| author | T(A)ILS developers <amnesia@boum.org> | 2010-10-23 12:14:32 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:54:32 +0100 |
| commit | 454a73ce6394830923bc54b584d33edf0e6918b1 (patch) | |
| tree | 2501a48315cc63236e28ba31bf6bd3256fb4f5c5 /scripts | |
| parent | 46f8f80975c374d382cb8419c3371e30597f8d8e (diff) | |
| download | live-boot-454a73ce6394830923bc54b584d33edf0e6918b1.tar.gz live-boot-454a73ce6394830923bc54b584d33edf0e6918b1.zip | |
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.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/live-helpers | 4 |
1 files changed, 2 insertions, 2 deletions
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 |