Use same device backing path as used in other places.
authorTails developers <amnesia@boum.org>
Sat, 11 Feb 2012 20:30:53 +0000 (21:30 +0100)
committerDaniel Baumann <daniel@debian.org>
Sun, 1 Apr 2012 20:13:36 +0000 (22:13 +0200)
scripts/live-helpers

index f1ebe86..43485ed 100644 (file)
@@ -373,6 +373,7 @@ find_persistent_media ()
        snapshots="${2}"
        black_listed_devices="${3}"
        white_listed_devices="${4}"
+       persistent_backing="${rootmnt}/live/persistent"
 
        for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}")
        do
@@ -413,7 +414,7 @@ find_persistent_media ()
                        devfstype="$(get_fstype ${dev})"
                        overlay_on_dev=""
                        snapshot_on_dev=""
-                       backing="/$(basename ${dev})-backing"
+                       backing="${persistent_backing}/$(basename ${dev})"
                        mkdir -p "${backing}"
                        if is_supported_fs ${devfstype} && try_mount "${dev}" "${backing}" "rw" "${devfstype}"
                        then