diff mbox series

[v5,05/17] bootstrap: move cleanup trap to function

Message ID 20260609123355.2368573-6-felix.moessbauer@siemens.com
State New
Headers show
Series [v5,01/17] refactor bootstrap: store rootfs tar with user permissions | expand

Commit Message

Felix Moessbauer June 9, 2026, 12:33 p.m. UTC 
By that, we can make the trap more easily conditional.

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

Patch

diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
index 596a6152..eba6ea85 100644
--- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
+++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc
@@ -110,10 +110,24 @@  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 \
     ${DISTRO_VARS_PREFIX}DISTRO_APT_SOURCES \
+    bootstrap_cleanup \
     "
 do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP} ${BOOTSTRAP_TMPDIR} ${WORKDIR}/trusted.gpg.d ${WORKDIR}/sources.list.d"
 do_bootstrap[depends] = "base-apt:do_cache isar-apt:do_cache_config"
@@ -206,16 +220,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}