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:59:20 +0100 |
| commit | 8c09fd6da365d440f1fcba11f732ca97864c9550 (patch) | |
| tree | 5fba27f47c6fc5dfd7a17d28ca3299d388362ff1 /scripts | |
| parent | f7bd72179a947e07671436a88de69550a3b91757 (diff) | |
| download | live-boot-8c09fd6da365d440f1fcba11f732ca97864c9550.tar.gz live-boot-8c09fd6da365d440f1fcba11f732ca97864c9550.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 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 |