X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Flive;h=a701f12b4b1a9789858216bc124ea02d7fa749bd;hb=267ca87d0d2892d69682228b65e49418d1aa93dd;hp=5e080f9eb8680490e8403550a7be55fc92f48845;hpb=aa2f9a8dff5be9a2a41cc7af053821d5afab0478;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 5e080f9..a701f12 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1001,7 +1001,7 @@ setup_unionfs ()
 
 		if echo ${PERSISTENT_METHOD} | grep -qe "\<overlay\>"
 		then
-			overlays="${root_overlay_label} ${custom_overlay_label}"
+			overlays="${root_overlay_label} ${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label}"
 		fi
 
 		if echo ${PERSISTENT_METHOD} | grep -qe "\<snapshot\>"
@@ -1013,11 +1013,11 @@ 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
-				${root_snapshot_label}=*)
+				${root_snapshot_label}=*|${old_root_snapshot_label}=*)
 					if [ -z "${root_snapdata}" ]
 					then
 						root_snapdata="${media#*=}"
@@ -1032,13 +1032,18 @@ setup_unionfs ()
 						home_snapdata="${media#*=}"
 					fi
 					;;
-				${root_overlay_label}=*)
+				${root_overlay_label}=*|${old_root_overlay_label}=*)
 					if [ -z "${root_overlay_device}" ]
 					then
 						device="${media#*=}"
 						root_overlay_device="${device}"
 					fi
 					;;
+				${old_home_overlay_label}=*)
+					device="${media#*=}"
+					fix_home_rw_compatibility ${device}
+					overlay_devices="${overlay_devices} ${device}"
+					;;
 				${custom_overlay_label}=*)
 					device="${media#*=}"
 					overlay_devices="${overlay_devices} ${device}"