[SCM] live-boot branch, debian, updated. debian/3.0_a25-1-72-gfc7a680
Daniel Baumann
daniel at debian.org
Thu Apr 5 06:21:40 UTC 2012
The following commit has been merged in the debian branch:
commit 656155fcea1cc331306ec32c246209e0098efdc7
Author: Tails developers <amnesia at boum.org>
Date: Sat Feb 11 21:30:53 2012 +0100
Use same device backing path as used in other places.
diff --git a/scripts/live-helpers b/scripts/live-helpers
index f1ebe86..43485ed 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -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
--
live-boot
More information about the debian-live-changes
mailing list