From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 09 Jun 2026 10:59:01 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f61.google.com (mail-lf1-f61.google.com [209.85.167.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6598x0gA004116 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 9 Jun 2026 10:59:00 +0200 Received: by mail-lf1-f61.google.com with SMTP id 2adb3069b0e04-5aa6a2882a2sf3571703e87.1 for ; Tue, 09 Jun 2026 01:59:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1780995535; cv=pass; d=google.com; s=arc-20240605; b=QWU6oGsGPBOrD/xAs1JeAtNrZHcXz71TRiHXSz376OOGw/lW//gswrXZodrBZqSb0H KJKVerMhph6d3zM7+MgI/cVPFs+0f5GCowZRGy5uTK6t9jpEe3jdsJYbQjnMnLifZfQZ nPMA2eoCkZa5w5nKbIT1zHbqL1o3I4qMf+SIbIUZNXbl2aqK/QNFdJ1DAIWIp9sK/rPw qVHHE4bKLbF36TD8yICQ7H7UN6jLwYfRUGNtAUsm+Z+JMboda5onS9XHSeyj3Q9AQn+E NqNA49p4qA5DkoYkv7WHvxsX/fXI83pvOPXnzLrYYN22hbyrUVA4EPNXLbuSLmCcAeog Ww/A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :sender:dkim-signature; bh=Zl0Exn/jS/BDKiMgXob0OVjMrdZSry/BJYvGKI8xt+o=; fh=1PgJqaOOYObY3NTpKQLjwxbNbd/ihcCj15+YhVXOD1k=; b=i9wiSawmpxhIyO2xtTECL6HKwtfnoKP53L511qkFU08RDPMKxgrn+Mc2HwsFPGAytL j5hRprn16calSYBxuJsJNqdxYOkSO+SRiG1skZTuX+icB9GTBYA1fJ6r7vE4FaDEyPnv wewU5Mwj7xm2hHRqTT+jjUSL+KFv9FfuIY7sBvU1BTEc/v6/Yb72OgPZeiKJjR2SeIGs t/yya/wi4mSi6DFaVhf7GhmINW1cMaogicHW/UEymsMMt8B6v/dwR+mctN2F6yIf3mUL r6BjRZnVOI6wl5lD8Gib6SyEbdxbjzBTqs44+z7PfuU+jTcibNu6He3iV8Wt0nBKnKC6 HARg==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1780995535; x=1781600335; darn=ilbers.de; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:in-reply-to:from:content-language:references:cc :to:subject:user-agent:mime-version:date:message-id:sender:from:to :cc:subject:date:message-id:reply-to; bh=Zl0Exn/jS/BDKiMgXob0OVjMrdZSry/BJYvGKI8xt+o=; b=EMCJtFzwq72h1mzZ7pc3ggHEWw1FzaymQGp8/fbQ59t8UkKSBuY1bG4v8SK58lm+Vi phWpSX5fBylXnbKwexfkTtekv+E2R9EnYqU3GpR9Pygo1/7rq6/n2zB+aUzW0PRHu/GS OLsUjlBKRRFiAUdJWOzOwuuU5pSy7upYnQ2n3rfdh5fqCV4cYxSELVw9gYwB25exOkue bCf90S0LxJXXVvWRAY+XdvBYxHplWMUpj8QlvCztdPQ+wIQ/+0zsAjE2Dtp4/M9bAdCF x2eBSr+KX2GPMCyW7hiZ5EkEie2oIBo6JMeWpctXPYED5jG1fB0u6Mo3EmCzZOg8xC1r ppCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780995535; x=1781600335; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:in-reply-to :from:content-language:references:cc:to:subject:user-agent :mime-version:date:message-id:x-beenthere:x-gm-message-state:sender :from:to:cc:subject:date:message-id:reply-to; bh=Zl0Exn/jS/BDKiMgXob0OVjMrdZSry/BJYvGKI8xt+o=; b=Z3j6iIeAtBHZZcYzBBnbQxQF/hWf8LHGw7aCn8Avox518AYn8v2wjGMyI/cZnawK1M 1NsKxHmewx23lHhmxaYPPuXAXDTvnO2g/neRPi2hHNFfUHW8j6atgRYQvyVuxYf5D7Uu FlHzQC3wCFmg27fo0SWX5/oPb+6WuO+0grZChbzf1fuvIs2GFsxWnppR6ext2dAsOmmi DMjs6f23sWkpfWABBIPg13RhmRuMKcfmbB1HhHydZXZvr14v74g6uvhdTh6/SueWNGbi oFQLWcdn3lVA7QTIqQVuXtXDbD+aoEhF/6qn01gbNXit5bp66bfxANwidHNEKuKQ9qRZ FMhw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AFNElJ+B69avao1d1H4jlJ+h84DL3RViDUaEmHByG/e7rAJXqIyWa7mD9HUemkGDUW0/5lfkb4dC@ilbers.de X-Gm-Message-State: AOJu0YyLhUF8/Foy2cdPW33MJ+rqx7Ib/fAO8WBBpkoNw8H3hh/C6dEN hcUSuh37nUpVM1z7NfVFPYWvqX6rN3RJvySvOsykSceLvlE3NH26sjpd X-Received: by 2002:a05:6512:66cf:b0:5aa:6cd6:a7ef with SMTP id 2adb3069b0e04-5aa87be2444mr3459383e87.45.1780995535052; Tue, 09 Jun 2026 01:58:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AX0PUUf5BTSzO+d9XF9YZuwghCECo9n33/3s83upaH42lgxE+g==" Received: by 2002:ac2:44d0:0:b0:5aa:6cb0:2a4 with SMTP id 2adb3069b0e04-5aa85e0303als1592598e87.1.-pod-prod-09-eu; Tue, 09 Jun 2026 01:58:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AFNElJ9KgrsqtW1eAXwk0qPp0HgYVKnR1pQ9wqLcfPILULiLZcU4tljEIxTgf9cmjb2Rj6BkjpvugKNTYFx2@googlegroups.com X-Received: by 2002:a05:6512:a95:b0:5a8:6e64:e88b with SMTP id 2adb3069b0e04-5aa87b67121mr5008043e87.4.1780995532979; Tue, 09 Jun 2026 01:58:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1780995532; cv=none; d=google.com; s=arc-20240605; b=aJGXXLwRFTap+tBmOoR1KVg34VzQOII/AIWrQRex77OhQP0WHQgNA1SlFDQv7lpW/k AeoUMN5X9ppl6TMhHPdlvp743yiqeEPdlXADt4qsTWWkt623aw9vS0NbvodRzFhDoO1m 8CXZGmMoO5qlHGonZiYyiY/EVXc3rJ7s5VIjb3g+4WwsTA5hM1U368bE7oSp+5UV2tAx 6N44UrPIOXLN1UibQpeukgP94wWkxsCHZtIhWFODeHy0Z2sQF7/XdIqy6XvqEQAgBOrw ZgNPnzoHAR34aTCf641dXdPJJ+rYSzo+uHOzXhbVhCtxt7ydVu4V9UJS7fLx07IwF0uP 1hng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id; bh=bvvznPzsgi3zJz3xdxbPrAH7SpVsl2bTxc7/K3wDyE0=; fh=aM+XVJzw2ahpEoNJzMYTk1qqXlaHrvkUStg13X+UaOc=; b=IRIX4FEolqTu2ECmq4Lrh4wLO3+rBuzIesONa9BZ2pROnhcil2epLMg46ludoO31sI UUqGG8D+yinn1CR8NkXpnxNoMYr25it2AJ2AA8ocd6j6+8LscR9htl7O9u2GupeFCXfE YHmAYoy8YdSap6/v8/W40F07KRv31CQc8oAJcfhyLB5s8eEoUZToM1N2UAV9XAZDnsGz iCn+GlusNCfl4phJ8U1tqQyhwtNhTPtuQDXvlKxM9JtmWfZpU3wkQWn4u/FVbQJmPJ95 d0NgIB/qw1+XUQ6bd3y7ipHAbCb92giqmvnZG0rXSyG2qs/S2lACmZNQlZQPj+eOyPsT CfDA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-5aa7b97fe8asi387145e87.6.2026.06.09.01.58.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Jun 2026 01:58:52 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from [127.0.0.1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 6598wo4Q004109 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 9 Jun 2026 10:58:51 +0200 Message-ID: <8460cc1e-7713-4ee3-864c-6e1fe5193246@ilbers.de> Date: Tue, 9 Jun 2026 11:58:50 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 05/17] bootstrap: move cleanup trap to function To: Felix Moessbauer , isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, quirin.gylstorff@siemens.com References: <20260601113505.2898877-1-felix.moessbauer@siemens.com> <20260601113505.2898877-6-felix.moessbauer@siemens.com> Content-Language: en-US, ru-RU From: Anton Mikanovich In-Reply-To: <20260601113505.2898877-6-felix.moessbauer@siemens.com> Content-Type: text/plain; charset="UTF-8"; format=flowed X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-TUID: OE8lE9VS7nHc 01.06.2026 14:34, 'Felix Moessbauer' via isar-users wrote: > By that, we can make the trap more easily conditional. > > Signed-off-by: Felix Moessbauer > --- > .../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 To make this trap work we need to add cleanup function into the run.* file. This can be done by adding bootstrap_cleanup to do_bootstrap[vardeps] list. > > # Create lock file so that it is owned by the user running the build (not root) > mkdir -p ${DEBDIR} -- 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/8460cc1e-7713-4ee3-864c-6e1fe5193246%40ilbers.de.