diff options
| author | Tails developers <amnesia@boum.org> | 2012-11-01 20:31:23 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-11-04 19:33:36 +0100 |
| commit | 3a682eb57ebf462f0bce391dae195d1c32d725db (patch) | |
| tree | 95cfa6e24c3ed40c9b9cea982c2229a417c76e82 /scripts/boot | |
| parent | 01ed18c494ddccd38c5d6592222623ee7c8456b1 (diff) | |
| download | live-boot-3a682eb57ebf462f0bce391dae195d1c32d725db.tar.gz live-boot-3a682eb57ebf462f0bce391dae195d1c32d725db.zip | |
Adding support for the previous persistence configuration file name, for compatibility with systems that have been deployed with live-persistence.conf already.
Diffstat (limited to 'scripts/boot')
| -rwxr-xr-x | scripts/boot/9990-aaa-fixme.sh | 1 | ||||
| -rwxr-xr-x | scripts/boot/9990-misc-helpers.sh | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/scripts/boot/9990-aaa-fixme.sh b/scripts/boot/9990-aaa-fixme.sh index b213bba..a1eb14a 100755 --- a/scripts/boot/9990-aaa-fixme.sh +++ b/scripts/boot/9990-aaa-fixme.sh @@ -44,6 +44,7 @@ old_root_overlay_label="live-rw" old_home_overlay_label="home-rw" custom_overlay_label="persistence" persistence_list="persistence.conf" +old_persistence_list="live-persistence.conf" if [ ! -f /live.vars ] then diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh index 06fef87..ace130b 100755 --- a/scripts/boot/9990-misc-helpers.sh +++ b/scripts/boot/9990-misc-helpers.sh @@ -1258,9 +1258,14 @@ get_custom_mounts () continue fi - local include_list="${backing}/${persistence_list}" - if [ ! -r "${include_list}" ] + local include_list + if [ -r "${backing}/${persistence_list}" ] then + include_list="${backing}/${persistence_list}" + elif [ -r "${backing}/${old_persistence_list}" ] + then + include_list="${backing}/${old_persistence_list}" + else continue fi |