From 9eaa276457e11d177b9b1c5413c95b198c62bef0 Mon Sep 17 00:00:00 2001 From: Ben Hoff Date: Mon, 12 May 2025 21:22:43 -0400 Subject: [PATCH] add in cache to the image, allowing caching in customize image step --- lib/functions/general/chroot-helpers.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/functions/general/chroot-helpers.sh b/lib/functions/general/chroot-helpers.sh index 07b62faf3e..a20a078f54 100644 --- a/lib/functions/general/chroot-helpers.sh +++ b/lib/functions/general/chroot-helpers.sh @@ -16,7 +16,9 @@ function mount_chroot() { local target target="$(realpath "$1")" # normalize, remove last slash if dir display_alert "mount_chroot" "$target" "debug" + mkdir -p "${target}/run/user/0" + mkdir -p "${target}/armbian/cache" # tmpfs size=50% is the Linux default, but we need more. mount -t tmpfs -o "size=99%" tmpfs "${target}/tmp" @@ -26,6 +28,8 @@ function mount_chroot() { mount -t sysfs chsys "${target}"/sys mount --bind /dev "${target}"/dev mount -t devpts chpts "${target}"/dev/pts || mount --bind /dev/pts "${target}"/dev/pts + + mount --bind /armbian/cache "${target}/armbian/cache" } # umount_chroot @@ -36,7 +40,7 @@ function umount_chroot() { local target target="$(realpath "$1")" # normalize, remove last slash if dir display_alert "Unmounting" "$target" "info" - while grep -Eq "${target}\/(dev|proc|sys|tmp|var\/tmp|run\/user\/0)" /proc/mounts; do + while grep -Eq "${target}\/(dev|proc|sys|tmp|var\/tmp|run\/user\/0|armbian\/cache)" /proc/mounts; do display_alert "Unmounting..." "target: ${target}" "debug" umount "${target}"/dev/pts || true umount --recursive "${target}"/dev || true @@ -45,6 +49,7 @@ function umount_chroot() { umount "${target}"/tmp || true umount "${target}"/var/tmp || true umount "${target}"/run/user/0 || true + umount "${target}"/armbian/cache || true wait_for_disk_sync "after umount chroot" run_host_command_logged grep -E "'${target}/(dev|proc|sys|tmp)'" /proc/mounts "||" true done