JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

add in cache to the image, allowing caching in customize image step

Browse Source
This commit is contained in:
Ben Hoff
2025-05-12 21:22:43 -04:00
committed by Igor
parent 23d6043df0
commit 9eaa276457
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/functions/general/chroot-helpers.sh
View File

@@ -16,7 +16,9 @@ function mount_chroot() {
local target local target
target="$(realpath "$1")" # normalize, remove last slash if dir target="$(realpath "$1")" # normalize, remove last slash if dir
display_alert "mount_chroot" "$target" "debug" display_alert "mount_chroot" "$target" "debug"
mkdir -p "${target}/run/user/0" mkdir -p "${target}/run/user/0"
mkdir -p "${target}/armbian/cache"
# tmpfs size=50% is the Linux default, but we need more. # tmpfs size=50% is the Linux default, but we need more.
mount -t tmpfs -o "size=99%" tmpfs "${target}/tmp" mount -t tmpfs -o "size=99%" tmpfs "${target}/tmp"
@@ -26,6 +28,8 @@ function mount_chroot() {
mount -t sysfs chsys "${target}"/sys mount -t sysfs chsys "${target}"/sys
mount --bind /dev "${target}"/dev mount --bind /dev "${target}"/dev
mount -t devpts chpts "${target}"/dev/pts || mount --bind /dev/pts "${target}"/dev/pts mount -t devpts chpts "${target}"/dev/pts || mount --bind /dev/pts "${target}"/dev/pts
mount --bind /armbian/cache "${target}/armbian/cache"
} }
# umount_chroot <target> # umount_chroot <target>
@@ -36,7 +40,7 @@ function umount_chroot() {
local target local target
target="$(realpath "$1")" # normalize, remove last slash if dir target="$(realpath "$1")" # normalize, remove last slash if dir
display_alert "Unmounting" "$target" "info" 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" display_alert "Unmounting..." "target: ${target}" "debug"
umount "${target}"/dev/pts || true umount "${target}"/dev/pts || true
umount --recursive "${target}"/dev || true umount --recursive "${target}"/dev || true
@@ -45,6 +49,7 @@ function umount_chroot() {
umount "${target}"/tmp || true umount "${target}"/tmp || true
umount "${target}"/var/tmp || true umount "${target}"/var/tmp || true
umount "${target}"/run/user/0 || true umount "${target}"/run/user/0 || true
umount "${target}"/armbian/cache || true
wait_for_disk_sync "after umount chroot" wait_for_disk_sync "after umount chroot"
run_host_command_logged grep -E "'${target}/(dev|proc|sys|tmp)'" /proc/mounts "||" true run_host_command_logged grep -E "'${target}/(dev|proc|sys|tmp)'" /proc/mounts "||" true
done done