QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove stale snapshots

Browse Source
This commit is contained in:
Jason Mehring 2014-10-19 04:23:19 -04:00
parent 8de6493230
commit 86ca300413
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts_debian/custom_wheezy_whonix/00_prepare_pre.sh
View File

@ -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

2
scripts_debian/custom_wheezy_whonix/01_install_core_post.sh
View File

@ -30,7 +30,7 @@ fi
splitPath "$IMG" path_parts
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" || :
warn "Copying $IMG to $PREPARED_IMG"
cp -f "$IMG" "$PREPARED_IMG"

2
scripts_debian/custom_wheezy_whonix/02_install_groups_packages_installed.sh
View File

@ -24,7 +24,7 @@ if [ "$SNAPSHOT" == "1" ]; then
splitPath "$IMG" path_parts
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" || :
warn "Copying $IMG to $PREPARED_IMG"
cp -f "$IMG" "$PREPARED_IMG"