Remove stale snapshots
This commit is contained in:
parent
8de6493230
commit
86ca300413
@ -41,9 +41,20 @@ INSTALLDIR="$(readlink -m mnt)"
|
|||||||
# Use a snapshot of the debootstraped debian image to install Whonix (for DEBUGGING)
|
# Use a snapshot of the debootstraped debian image to install Whonix (for DEBUGGING)
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
|
|
||||||
copy_snapshot() {
|
manage_snapshot() {
|
||||||
warn "Copying $1 to $IMG"
|
|
||||||
umount_kill "$INSTALLDIR" || :
|
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
|
mount -o loop "$1" "$INSTALLDIR" || exit 1
|
||||||
rm -f "$INSTALLDIR/tmp/.prepared_groups"
|
rm -f "$INSTALLDIR/tmp/.prepared_groups"
|
||||||
umount_kill "$INSTALLDIR" || :
|
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]}"
|
updated_snapshot="${path_parts[dir]}${path_parts[base]}-updated${path_parts[dotext]}"
|
||||||
|
|
||||||
if [ -f "$updated_snapshot" ]; then
|
if [ -f "$updated_snapshot" ]; then
|
||||||
copy_snapshot "$updated_snapshot"
|
manage_snapshot "$updated_snapshot"
|
||||||
elif [ -f "$debootstrap_snapshot" ]; then
|
elif [ -f "$debootstrap_snapshot" ]; then
|
||||||
copy_snapshot "$debootstrap_snapshot"
|
manage_snapshot "$debootstrap_snapshot"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ fi
|
|||||||
splitPath "$IMG" path_parts
|
splitPath "$IMG" path_parts
|
||||||
PREPARED_IMG="${path_parts[dir]}${path_parts[base]}-debootstrap${path_parts[dotext]}"
|
PREPARED_IMG="${path_parts[dir]}${path_parts[base]}-debootstrap${path_parts[dotext]}"
|
||||||
|
|
||||||
if ! [ -f "$PREPARED_IMG" ]; then
|
if ! [ -f "$PREPARED_IMG" ] && ! [ -f "$INSTALLDIR/tmp/.prepared_whonix" ]; then
|
||||||
umount_kill "$INSTALLDIR" || :
|
umount_kill "$INSTALLDIR" || :
|
||||||
warn "Copying $IMG to $PREPARED_IMG"
|
warn "Copying $IMG to $PREPARED_IMG"
|
||||||
cp -f "$IMG" "$PREPARED_IMG"
|
cp -f "$IMG" "$PREPARED_IMG"
|
||||||
|
@ -24,7 +24,7 @@ if [ "$SNAPSHOT" == "1" ]; then
|
|||||||
splitPath "$IMG" path_parts
|
splitPath "$IMG" path_parts
|
||||||
PREPARED_IMG="${path_parts[dir]}${path_parts[base]}-updated${path_parts[dotext]}"
|
PREPARED_IMG="${path_parts[dir]}${path_parts[base]}-updated${path_parts[dotext]}"
|
||||||
|
|
||||||
if ! [ -f "$PREPARED_IMG" ]; then
|
if ! [ -f "$PREPARED_IMG" ] && ! [ -f "$INSTALLDIR/tmp/.prepared_whonix" ]; then
|
||||||
umount_kill "$INSTALLDIR" || :
|
umount_kill "$INSTALLDIR" || :
|
||||||
warn "Copying $IMG to $PREPARED_IMG"
|
warn "Copying $IMG to $PREPARED_IMG"
|
||||||
cp -f "$IMG" "$PREPARED_IMG"
|
cp -f "$IMG" "$PREPARED_IMG"
|
||||||
|
Loading…
Reference in New Issue
Block a user