Compress pass1 and pass2 snapshots

1 files changed, 8 insertions, 6 deletions

diff --git a/run-bootstrap-in-chroot b/run-bootstrap-in-chroot
index 9864337d..163ee63a 100755
--- a/run-bootstrap-in-chroot
+++ b/run-bootstrap-in-chroot
@@ -80,16 +80,17 @@ else
 fi
 
 # Unpack existing snapshot, or run pass1 of bootstrap and then make snapshot.
-if "$snapshot" && [ -e "$snapshotdir/pass1-snapshot.tar" ]
+pass1snapshot="$snapshotdir/pass1-snapshot.tar.gz"
+if "$snapshot" && [ -e "$pass1snapshot" ]
 then
-    tar -C "$dir" -xf "$snapshotdir/pass1-snapshot.tar"
+    tar -C "$dir" -xf "$pass1snapshot"
     cp baserock-bootstrap "$dir/." #update bootstrap script
 else
     cp baserock-bootstrap "$dir/."
     "./do-squeeze-chroot" bash -x baserock-bootstrap pass1 || exit 1
     if "$snapshot"
     then
-        tar -C "$dir" -caf "$snapshotdir/pass1-snapshot.tar" .
+        tar -C "$dir" -caf "$pass1snapshot" .
     fi
 fi
 
@@ -101,16 +102,17 @@ mkdir "$dir/tree/baserock/gits/morph"
 cp -r . "$dir/tree/baserock/gits/morph/."
 
 # Unpack existing snapshot, or run pass2 of bootstrap and then make snapshot.
-if "$snapshot" && [ -e "$snapshotdir/pass2-snapshot.tar" ]
+pass2snapshot="$snapshotdir/pass2-snapshot.tar.gz"
+if "$snapshot" && [ -e "$pass2snapshot" ]
 then
-    tar -C "$dir" -xf "$snapshotdir/pass2-snapshot.tar"
+    tar -C "$dir" -xf "$pass2snapshot"
     cp baserock-bootstrap "$dir/." #update bootstrap script
 else
     cp baserock-bootstrap "$dir/."
     "./do-squeeze-chroot" bash -x baserock-bootstrap pass2 || exit 1
     if "$snapshot"
     then
-        tar -C "$dir" -caf "$snapshotdir/pass2-snapshot.tar" .
+        tar -C "$dir" -caf "$pass2snapshot" .
     fi
 fi