diff options
| author | Tails developers <amnesia@boum.org> | 2012-02-15 12:00:51 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-04-05 07:45:21 +0200 |
| commit | b78990c495520b41ce163a55dee2d002ebba10de (patch) | |
| tree | 863fe4d25a29bbe1a6db6bdaed5bf17e371f9c5f /scripts/live | |
| parent | bfec46ce25357e087378ca220b852aca1bb83e09 (diff) | |
| download | live-boot-b78990c495520b41ce163a55dee2d002ebba10de.tar.gz live-boot-b78990c495520b41ce163a55dee2d002ebba10de.zip | |
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.
Diffstat (limited to 'scripts/live')
| -rwxr-xr-x | scripts/live | 11 |
1 files changed, 8 insertions, 3 deletions
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 "\<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\>" @@ -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}" |