X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=494abc7061834d79eb56e7f30058021f3c7d0d05;hb=3b8017136669394c9e2c92aca2d917c98a186b34;hp=6f0dc48483843537b6e1e71956c10a2c37572595;hpb=931f580302ca3a121d3be602a49e732d5189b667;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 6f0dc48..494abc7 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1403,23 +1403,35 @@ setup_unionfs ()
 			snapshots="${root_snapshot_label} ${home_snapshot_label}"
 		fi
 
-		overlay_devices=""
+		local root_snapdata=""
+		local home_snapshot_label=""
+		local root_overlay_label=""
+		local overlay_devices=""
 		for media in $(find_persistent_media "${overlays}" "${snapshots}" "${blacklistdev}" "${whitelistdev}")
 		do
 			media="$(echo ${media} | tr ":" " ")"
 			case ${media} in
 				${root_snapshot_label}=*)
-					root_snapdata="${media#*=}"
+					if [ -z "${root_snapdata}" ]
+					then
+						root_snapdata="${media#*=}"
+					fi
 					;;
 				${home_snapshot_label}=*)
 					# This second type should be removed when snapshot will get smarter,
 					# hence when "/etc/live-snapshot*list" will be supported also by
 					# ext2|ext3|ext4|jffs2 snapshot types.
-					home_snapdata="${media#*=}"
+					if [ -z "${home_snapdata}" ]
+					then
+						home_snapdata="${media#*=}"
+					fi
 					;;
 				${root_overlay_label}=*)
-					device="${media#*=}"
-					root_overlay_device="${device}"
+					if [ -z "${root_overlay_device}" ]
+					then
+						device="${media#*=}"
+						root_overlay_device="${device}"
+					fi
 					;;
 				${custom_overlay_label}=*)
 					device="${media#*=}"