Compare commits

...

2 commits

Author SHA1 Message Date
6e29feb06a
Disable fstrim
Some checks failed
/ build-test (pull_request) Failing after 10m36s
2024-08-21 14:22:31 -04:00
d2a55dd4e6
Revert "use sudo when chroot mount"
This reverts commit 3e94341f43.
2024-08-21 14:04:23 -04:00
2 changed files with 14 additions and 2 deletions

View file

@ -1,3 +1,15 @@
diff --git a/cleanup_image b/cleanup_image
index 224c04a..7a03b9a 100755
--- a/cleanup_image
+++ b/cleanup_image
@@ -20,5 +20,5 @@ fi
echo "--> Cleaning up image file..."
$SCRIPTSDIR/09_cleanup.sh
-echo "--> Compacting image file..."
-/sbin/fstrim -v "$INSTALLDIR"
+# echo "--> Compacting image file..."
+# /sbin/fstrim -v "$INSTALLDIR"
diff --git a/prepare_image b/prepare_image
index 6334879..de1a2af 100755
--- a/prepare_image

View file

@ -11,7 +11,7 @@ shopt -s extglob
die() { error "$@"; exit 1; }
chroot_add_mount() {
sudo mount "$@" && CHROOT_ACTIVE_MOUNTS=("$2" "${CHROOT_ACTIVE_MOUNTS[@]}")
mount "$@" && CHROOT_ACTIVE_MOUNTS=("$2" "${CHROOT_ACTIVE_MOUNTS[@]}")
}
chroot_setup() {
@ -53,7 +53,7 @@ chroot_teardown() {
# alpine-chroot kills gpg-agent, started by pacman-key, which otherwise
# keeps the mounts busy and prevents unmounting
pkill gpg-agent
sudo umount "${CHROOT_ACTIVE_MOUNTS[@]}"
umount "${CHROOT_ACTIVE_MOUNTS[@]}"
unset CHROOT_ACTIVE_MOUNTS
}