Add backwards compatibility for old labels: live-{rw,sn} and home-rw.

[live-boot-grml.git] / scripts / live

diff --git a/scripts/live b/scripts/live
index f59ae71..7f76f52 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -11,12 +11,6 @@ mountpoint="/live/image"
 alt_mountpoint="/media"
 LIVE_MEDIA_PATH="live"
 
-root_overlay_label="full-ov"
-custom_overlay_label="custom-ov"
-root_snapshot_label="live-sn"
-home_snapshot_label="home-sn"
-persistence_list="live.persist"
-
 USERNAME="user"
 USERFULLNAME="Live user"
 HOSTNAME="host"
@@ -1007,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\>"
@@ -1023,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#*=}"
@@ -1038,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}"