Adding support for the previous persistence configuration file name, for compatibilit...
authorTails developers <amnesia@boum.org>
Thu, 1 Nov 2012 19:31:23 +0000 (20:31 +0100)
committerDaniel Baumann <daniel@debian.org>
Sun, 4 Nov 2012 18:33:36 +0000 (19:33 +0100)
scripts/boot/9990-aaa-fixme.sh
scripts/boot/9990-misc-helpers.sh

index b213bba..a1eb14a 100755 (executable)
@@ -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
index 06fef87..ace130b 100755 (executable)
@@ -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