[PATCH v3 05/16] bootstrap: move cleanup trap to function

'Felix Moessbauer' via isar-users
2026-04-07T14:23:33Z

By that, we can make the trap more easily conditional.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
.../isar-mmdebstrap/isar-mmdebstrap.inc | 24 +++++++++++--------
1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
index da8bc52d..cf6c355c 100644
--- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
+++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
@@ -110,6 +110,19 @@ def get_apt_auth_opts(d):
f"--setup-hook='upload \"{workdir}/apt-auth\" /etc/apt/auth.conf.d/isar.conf'"
return ''

+bootstrap_cleanup() {
+ [ -r "${WORKDIR}/mmtmpdir" ] && tmpdir=$(cat "${WORKDIR}/mmtmpdir") \
+ && rm "${WORKDIR}/mmtmpdir"
+ [ -d "$tmpdir" ] && mountpoint -q $tmpdir/$base_apt_tmp \
+ && run_privileged umount $tmpdir/$base_apt_tmp
+ [ -d "$tmpdir" ] && mountpoint -q $tmpdir/base-apt \
+ && run_privileged umount $tmpdir/base-apt
+ [ -d "$tmpdir" ] && run_privileged rm -rf --one-file-system $tmpdir
+ [ -n "$base_apt_tmp" ] && mountpoint -q $base_apt_tmp \
+ && run_privileged umount $base_apt_tmp \
+ && rm -rf --one-file-system $base_apt_tmp
+}
+
do_bootstrap[vardeps] += " \
DISTRO_APT_PREMIRRORS \
ISAR_ENABLE_COMPAT_ARCH \
@@ -206,16 +219,7 @@ do_bootstrap() {

# Cleanup mounts if fails
trap 'exit 1' INT HUP QUIT TERM ALRM USR1
- trap '[ -r "${WORKDIR}/mmtmpdir" ] && tmpdir=$(cat "${WORKDIR}/mmtmpdir") \
- && rm "${WORKDIR}/mmtmpdir"; \
- [ -d "$tmpdir" ] && mountpoint -q $tmpdir/$base_apt_tmp \
- && run_privileged umount $tmpdir/$base_apt_tmp; \
- [ -d "$tmpdir" ] && mountpoint -q $tmpdir/base-apt \
- && run_privileged umount $tmpdir/base-apt; \
- [ -d "$tmpdir" ] && run_privileged rm -rf --one-file-system $tmpdir; \
- [ -n "$base_apt_tmp" ] && mountpoint -q $base_apt_tmp \
- && run_privileged umount $base_apt_tmp \
- && rm -rf --one-file-system $base_apt_tmp' EXIT
+ trap 'bootstrap_cleanup' EXIT

# Create lock file so that it is owned by the user running the build (not root)
mkdir -p ${DEBDIR}
--
2.53.0

--
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20260407142310.2327696-6-felix.moessbauer%40siemens.com.