Skip to content

Commit 5216e73

Browse files
committed
Revert "add in cache to the image, allowing caching in customize image step"
This reverts commit 9eaa276.
1 parent ff1fcf5 commit 5216e73

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

lib/functions/general/chroot-helpers.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ function mount_chroot() {
1616
local target
1717
target="$(realpath "$1")" # normalize, remove last slash if dir
1818
display_alert "mount_chroot" "$target" "debug"
19-
2019
mkdir -p "${target}/run/user/0"
21-
mkdir -p "${target}/armbian/cache"
2220

2321
# tmpfs size=50% is the Linux default, but we need more.
2422
mount -t tmpfs -o "size=99%" tmpfs "${target}/tmp"
@@ -28,8 +26,6 @@ function mount_chroot() {
2826
mount -t sysfs chsys "${target}"/sys
2927
mount --bind /dev "${target}"/dev
3028
mount -t devpts chpts "${target}"/dev/pts || mount --bind /dev/pts "${target}"/dev/pts
31-
32-
mount --bind /armbian/cache "${target}/armbian/cache"
3329
}
3430

3531
# umount_chroot <target>
@@ -40,7 +36,7 @@ function umount_chroot() {
4036
local target
4137
target="$(realpath "$1")" # normalize, remove last slash if dir
4238
display_alert "Unmounting" "$target" "info"
43-
while grep -Eq "${target}\/(dev|proc|sys|tmp|var\/tmp|run\/user\/0|armbian\/cache)" /proc/mounts; do
39+
while grep -Eq "${target}\/(dev|proc|sys|tmp|var\/tmp|run\/user\/0)" /proc/mounts; do
4440
display_alert "Unmounting..." "target: ${target}" "debug"
4541
umount "${target}"/dev/pts || true
4642
umount --recursive "${target}"/dev || true
@@ -49,7 +45,6 @@ function umount_chroot() {
4945
umount "${target}"/tmp || true
5046
umount "${target}"/var/tmp || true
5147
umount "${target}"/run/user/0 || true
52-
umount "${target}"/armbian/cache || true
5348
wait_for_disk_sync "after umount chroot"
5449
run_host_command_logged grep -E "'${target}/(dev|proc|sys|tmp)'" /proc/mounts "||" true
5550
done

0 commit comments

Comments
 (0)