We don't black list storage devices any more.
authorTails developers <amnesia@boum.org>
Wed, 15 Feb 2012 11:03:56 +0000 (12:03 +0100)
committerDaniel Baumann <daniel@debian.org>
Thu, 5 Apr 2012 05:45:35 +0000 (07:45 +0200)
scripts/live
scripts/live-helpers

index 7f76f52..a701f12 100755 (executable)
@@ -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
index abdfd64..a69ce29 100644 (file)
@@ -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=""