diff options
| author | Tails developers <amnesia@boum.org> | 2012-02-15 12:03:56 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-04-05 07:45:35 +0200 |
| commit | ad772f205c1044ce7fe5383d72aae9a3ca8f33a7 (patch) | |
| tree | 3e08caad08135e895e2f56d175d9bc2a102226c5 /scripts | |
| parent | b78990c495520b41ce163a55dee2d002ebba10de (diff) | |
| download | live-boot-ad772f205c1044ce7fe5383d72aae9a3ca8f33a7.tar.gz live-boot-ad772f205c1044ce7fe5383d72aae9a3ca8f33a7.zip | |
We don't black list storage devices any more.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live | 2 | ||||
| -rw-r--r-- | scripts/live-helpers | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/scripts/live b/scripts/live index 7f76f52..a701f12 100755 --- a/scripts/live +++ b/scripts/live @@ -1013,7 +1013,7 @@ setup_unionfs () local home_snapshot_label="" local root_overlay_label="" local overlay_devices="" - for media in $(find_persistent_media "${overlays}" "${snapshots}" "${blacklistdev}" "${whitelistdev}") + for media in $(find_persistent_media "${overlays}" "${snapshots}" "${whitelistdev}") do media="$(echo ${media} | tr ":" " ")" case ${media} in diff --git a/scripts/live-helpers b/scripts/live-helpers index abdfd64..a69ce29 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -857,11 +857,10 @@ find_persistent_media () local overlays="${1}" local snapshots="${2}" - local black_listed_devices="${3}" - local white_listed_devices="${4}" + local white_listed_devices="${3}" local ret="" - for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}") + for dev in $(storage_devices "" "${white_listed_devices}") do local result="" |