From b9768d98fdb8ec5dcce30f9fbdc00c7846ec28a4 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Fri, 1 Sep 2023 15:41:55 -0400
Subject: [PATCH] Handle failing to bind mount

---
 buildiso.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/buildiso.sh b/buildiso.sh
index 4f6ae32..5dd971b 100755
--- a/buildiso.sh
+++ b/buildiso.sh
@@ -110,13 +110,18 @@ prepare_rootfs() {
     SQUASHFS_PKGLIST="mdadm,lvm2,parted,gdisk,debootstrap,grub-pc,grub-efi-amd64,linux-image-amd64,sipcalc,live-boot,dosfstools,vim,ca-certificates"
     if [[ ! -d artifacts/debootstrap ]]; then
         sudo mkdir -p artifacts/debootstrap/var/cache/apt/archives &>/dev/null
-        sudo mount --bind /var/cache/apt/archives artifacts/debootstrap/var/cache/apt/archives &>/dev/null
+        clean_me="y"
+        sudo mount --bind /var/cache/apt/archives artifacts/debootstrap/var/cache/apt/archives &>/dev/null && clean_me=""
         sudo /usr/sbin/debootstrap \
             --include=${SQUASHFS_PKGLIST} \
             buster \
             artifacts/debootstrap/ \
             http://ftp.ca.debian.org/debian &>debootstrap.log || fail "Error performing debootstrap."
-        sudo umount artifacts/debootstrap/var/cache/apt/archives &>/dev/null
+        if [[ -n ${clean_me} ]]; then
+            sudo chroot artifacts/debootstrap/ apt clean &>/dev/null || fail "Error cleaning apt cache in debootstrap."
+        else
+            sudo umount artifacts/debootstrap/var/cache/apt/archives &>/dev/null
+        fi
     fi
     sudo rsync -au artifacts/debootstrap/ ${tempdir}/rootfs/ &>/dev/null || fail "Error copying debootstrap to tempdir."
     echo "done."