X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2F9990-overlay.sh;h=6b620938fe496bffd3410c8327f118e13404c20d;hb=0aa07bd386f516176364e710e8b9132036c72986;hp=098111c65fcc49f8fbea5a518dbe02f690170b86;hpb=d2b2a46118d331a5b3c0218c475da8e5aa831df8;p=live-boot-grml.git

diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh
index 098111c..6b62093 100755
--- a/scripts/boot/9990-overlay.sh
+++ b/scripts/boot/9990-overlay.sh
@@ -210,7 +210,7 @@ setup_unionfs ()
 
 		if is_in_comma_sep_list overlay ${PERSISTENCE_METHOD}
 		then
-			overlays="${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label}"
+			overlays="${custom_overlay_label}"
 		fi
 
 		local overlay_devices
@@ -222,18 +222,6 @@ setup_unionfs ()
 				media="$(echo ${media} | tr ":" " ")"
 
 				case ${media} in
-					${old_root_overlay_label}=*)
-						device="${media#*=}"
-						fix_backwards_compatibility ${device} / union
-						overlay_devices="${overlay_devices} ${device}"
-						;;
-
-					${old_home_overlay_label}=*)
-						device="${media#*=}"
-						fix_backwards_compatibility ${device} /home bind
-						overlay_devices="${overlay_devices} ${device}"
-						;;
-
 					${custom_overlay_label}=*)
 						device="${media#*=}"
 						overlay_devices="${overlay_devices} ${device}"
@@ -393,7 +381,7 @@ setup_unionfs ()
 		# Gather information about custom mounts from devies detected as overlays
 		get_custom_mounts ${custom_mounts} ${overlay_devices}
 
-		[ -n "${DEBUG}" ] && cp ${custom_mounts} "/lib/live/mount/persistence"
+		[ -n "${LIVE_BOOT_DEBUG}" ] && cp ${custom_mounts} "/lib/live/mount/persistence"
 
 		# Now we do the actual mounting (and symlinking)
 		local used_overlays
@@ -404,7 +392,7 @@ setup_unionfs ()
 		# Close unused overlays (e.g. due to missing $persistence_list)
 		for overlay in ${overlay_devices}
 		do
-			if echo ${used_overlays} | grep -qve "^\(.* \)\?${device}\( .*\)\?$"
+			if echo ${used_overlays} | grep -qve "^\(.* \)\?${overlay}\( .*\)\?$"
 			then
 				close_persistence_media ${overlay}
 			fi
@@ -414,5 +402,5 @@ setup_unionfs ()
         # ensure that a potentially stray tmpfs gets removed
         # otherways, initramfs-tools is unable to remove /live
         # and fails to boot
-        umount /live/overlay || true
+        umount /live/overlay > /dev/null 2>&1 || true
 }