|
|
|
@ -41,9 +41,20 @@ INSTALLDIR="$(readlink -m mnt)"
|
|
|
|
|
# Use a snapshot of the debootstraped debian image to install Whonix (for DEBUGGING)
|
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
copy_snapshot() {
|
|
|
|
|
warn "Copying $1 to $IMG"
|
|
|
|
|
manage_snapshot() {
|
|
|
|
|
umount_kill "$INSTALLDIR" || :
|
|
|
|
|
|
|
|
|
|
mount -o loop "$IMG" "$INSTALLDIR" || exit 1
|
|
|
|
|
# Remove old snapshots if whonix completed
|
|
|
|
|
if [ -f "$INSTALLDIR/tmp/.prepared_whonix" ]; then
|
|
|
|
|
warn "Removing stale snapshots"
|
|
|
|
|
umount_kill "$INSTALLDIR" || :
|
|
|
|
|
rm -rf "$debootstrap_snapshot"
|
|
|
|
|
rm -rf "$updated_snapshot"
|
|
|
|
|
return
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
warn "Copying $1 to $IMG"
|
|
|
|
|
mount -o loop "$1" "$INSTALLDIR" || exit 1
|
|
|
|
|
rm -f "$INSTALLDIR/tmp/.prepared_groups"
|
|
|
|
|
umount_kill "$INSTALLDIR" || :
|
|
|
|
@ -55,8 +66,8 @@ debootstrap_snapshot="${path_parts[dir]}${path_parts[base]}-debootstrap${path_pa
|
|
|
|
|
updated_snapshot="${path_parts[dir]}${path_parts[base]}-updated${path_parts[dotext]}"
|
|
|
|
|
|
|
|
|
|
if [ -f "$updated_snapshot" ]; then
|
|
|
|
|
copy_snapshot "$updated_snapshot"
|
|
|
|
|
manage_snapshot "$updated_snapshot"
|
|
|
|
|
elif [ -f "$debootstrap_snapshot" ]; then
|
|
|
|
|
copy_snapshot "$debootstrap_snapshot"
|
|
|
|
|
manage_snapshot "$debootstrap_snapshot"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|