X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=b90637a625d0a98a871bd3e1c42ffab51ddd5244;hb=285412f944154e428f9da10f0e270aa85afe9276;hp=9a80b110a2cf3762bf9eca8cb1bfca499ea81016;hpb=f92f379a6e868bc486c050ff5ca81c1707da7374;p=live-boot-grml.git

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 9a80b11..b90637a 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -743,6 +743,8 @@ try_mount ()
 mount_persistence_media ()
 {
 	local device=${1}
+	local probe=${2}
+
 	local backing="/live/persistence/$(basename ${device})"
 
 	mkdir -p "${backing}"
@@ -760,7 +762,8 @@ mount_persistence_media ()
 			echo ${backing}
 			return 0
 		else
-			log_warning_msg "Failed to mount persistence media ${device}"
+			[ -z "${probe}" ] && log_warning_msg "Failed to mount persistence media ${device}"
+			rmdir "${backing}"
 			return 1
 		fi
 	elif [ "${backing}" != "${old_backing}" ]
@@ -770,7 +773,8 @@ mount_persistence_media ()
 			echo ${backing}
 			return 0
 		else
-			log_warning_msg "Failed to move persistence media ${device}"
+			[ -z "${probe}" ] && log_warning_msg "Failed to move persistence media ${device}"
+			rmdir "${backing}"
 			return 1
 		fi
 	fi
@@ -906,7 +910,7 @@ probe_for_file_name ()
 	local dev="${3}"
 
 	local ret=""
-	local backing="$(mount_persistence_media ${dev})"
+	local backing="$(mount_persistence_media ${dev} probe)"
 	if [ -z "${backing}" ]
 	then
 	    return
@@ -969,7 +973,9 @@ find_persistence_media ()
 	local white_listed_devices="${3}"
 	local ret=""
 
-	for dev in $(storage_devices "" "${white_listed_devices}")
+	local black_listed_devices="$(what_is_mounted_on /live/image)"
+
+	for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
 	do
 		local result=""