X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=components%2F9990-overlay.sh;h=58828f66524acca9655bc788b29c344a1ad081c3;hb=1a226f4c74bf1952ed77394ab9e9805055d0ed35;hp=77000d1cccb25c2f06e75e12a8012ebe840ce474;hpb=14f658f90367f29d20e4fed7ad3a228994057e58;p=live-boot-grml.git

diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh
index 77000d1..58828f6 100755
--- a/components/9990-overlay.sh
+++ b/components/9990-overlay.sh
@@ -190,7 +190,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} ${old_custom_overlay_label}"
+			overlays="${custom_overlay_label}"
 		fi
 
 		local overlay_devices
@@ -202,27 +202,10 @@ 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}"
 						;;
-
-					${old_custom_overlay_label}=*)
-						device="${media#*=}"
-						overlay_devices="${overlay_devices} ${device}"
-						;;
 				 esac
 			done
 		fi
@@ -374,8 +357,8 @@ setup_unionfs ()
 		done
 	fi
 
-        # ensure that a potentially stray tmpfs gets removed
-        # otherways, initramfs-tools is unable to remove /live
-        # and fails to boot
-        umount /live/overlay > /dev/null 2>&1 || true
+	# ensure that a potentially stray tmpfs gets removed
+	# otherways, initramfs-tools is unable to remove /live
+	# and fails to boot
+	umount /live/overlay > /dev/null 2>&1 || true
 }