From b78990c495520b41ce163a55dee2d002ebba10de Mon Sep 17 00:00:00 2001 From: Tails developers Date: Wed, 15 Feb 2012 12:00:51 +0100 Subject: Add backwards compatibility for old labels: live-{rw,sn} and home-rw. For home-rw we create a live.persist file which make old volumes completely compatible with the custom mounts system. --- scripts/live | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'scripts/live') diff --git a/scripts/live b/scripts/live index 5e080f9..7f76f52 100755 --- a/scripts/live +++ b/scripts/live @@ -1001,7 +1001,7 @@ setup_unionfs () if echo ${PERSISTENT_METHOD} | grep -qe "\" 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 "\" @@ -1017,7 +1017,7 @@ setup_unionfs () 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}" -- cgit v1.2.3