X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=e2489373255df46c1b698cc500fa3f8c5619af6c;hb=fe3b574c47a81858e256abd8fde409eda4dc99e1;hp=3a1eb607df24180a06615ddfc4eeb3c5e5391018;hpb=414dbb0e24c4e6be48524a94c11212ce2977bf86;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 3a1eb60..e248937 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1223,14 +1223,24 @@ setup_unionfs ()
 		rm -rf ${custom_mounts} 2> /dev/null
 
 		# Gather information about custom mounts from devies detected as overlays
-		get_custom_mounts ${overlay_devices} ${custom_mounts}
+		get_custom_mounts ${custom_mounts} ${overlay_devices}
 
 		[ -n "${DEBUG}" ] && cp ${custom_mounts} "${rootmnt}/live/persistent"
 
 		# Now we do the actual mounting (and symlinking)
-		do_custom_mounts ${custom_mounts}
+		local used_overlays=""
+		used_overlays=$(activate_custom_mounts ${custom_mounts})
 		rm ${custom_mounts}
 
+		# Close unused overlays (e.g. due to missing $persistence_list)
+		for overlay in ${overlay_devices}
+		do
+			if echo ${used_overlays} | grep -qve "^\(.* \)\?${device}\( .*\)\?$"
+			then
+				close_persistent_media ${overlay}
+			fi
+		done
+
 		# Look for other snapshots to copy in
 		try_snap "${root_snapdata}" "${rootmnt}" "ROOT"
 		# This second type should be removed when snapshot grow smarter