From ad772f205c1044ce7fe5383d72aae9a3ca8f33a7 Mon Sep 17 00:00:00 2001
From: Tails developers <amnesia@boum.org>
Date: Wed, 15 Feb 2012 12:03:56 +0100
Subject: We don't black list storage devices any more.

---
 scripts/live         | 2 +-
 scripts/live-helpers | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'scripts')

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=""
 
-- 
cgit v1.2.3