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; Fri, 27 Feb 2026 15:57:46 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f191.google.com (mail-qt1-f191.google.com [209.85.160.191]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 61REvif1015398 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 27 Feb 2026 15:57:45 +0100 Received: by mail-qt1-f191.google.com with SMTP id d75a77b69052e-5069ba5af5bsf155126361cf.2 for ; Fri, 27 Feb 2026 06:57:45 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1772204259; cv=pass; d=google.com; s=arc-20240605; b=dcJnV6FtCARbliV9jdurOQcv1UOPI5Kin1apm9gVpDAi9Xgxkc/7dgYIJg1Frofu09 14nzVRnmDE9Yl/FqrTUx3LloMERZ37DjEuaehLDFhKIyirSjNFpInLpfOzHnaknEQDLJ F67AWtLloE+LijP1khNwi9wzKYOobTH0BTmInKgmKVWUtKnAaw0u4m6Dex/lr5zJlFgZ hfkG2p9FZPJkp/SqFqiVY5ZZpWzU40vfZuVs7zs7cfmGV+4v7iwX7sFQfPXCyhlhLqGX +yONBngqGW0OwzFnY8YKp06LluMtc3Vknm1lYw0PzBou3k4lUroSQTvRUHm2LG8m6AJR o0AQ== ARC-Message-Signature: i=3; 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:reply-to:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=zlLTj0y7Y2UDiHZJN3yQ83CVzgr6tgOutiukjeniWzU=; fh=aTd+4izpwxKia5Vg1q3UeNiE/vtvPkDkZjPPwk1jE2Y=; b=lI8VEt06V/2FsCBHHRDfaSs49VuW0Sh3SvQSSVWBbCklVx7Hqf/+UWS1U1CXhhEcyn +JGy+54UEFBbKto3l4eCb05Jmh/yezf3e8Ia+ts4Sdp2xYH98+m1oPjI4SVb9ObMg8bX 3OLymd6+rnCqJojaiD5t0RJUxWGpb1aLbV4YOGTt3HiTpDTgsbY8dms9Fduv6Hazt8c+ aKp5ZaXOC5gIXiuwrVmzXvWrNRW75vuBGouVyOBoYxyGttt+l/oND0k4OPueQ6lmyH0K syIjs4VREdSIMVGMP21qPNvzLAc8bVpg9RW6vtJmvmht2zeud2st2pboPZWaAHLS6sfL j04w==; darn=ilbers.de ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Iz776jIw; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c20f::7 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1772204259; x=1772809059; darn=ilbers.de; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=zlLTj0y7Y2UDiHZJN3yQ83CVzgr6tgOutiukjeniWzU=; b=o6KZz4YBFd0bgx3H/daxOANAVYwoRxdBOQEBO+nhwzUUxolSQU6ZKDU+KxxME1ZX5g dJ4ztiZlG5654mc+zmKMyLT4wXUCaZO4Yxt/5ZQEUdwMkQ7EzXcVbDRQq1eUyZBWUr73 s8pCKUTCxW8nmScBmOO3G8SOPxxgTQHXMwaIgy5aeKYNSpBRFIXYSh6XN/cr0nhdbfc3 JFWJXDMNd5qhkATVRSQWK2oDrNJmaeWR2crFL0+6BPl5Q2s7Tg02vYelVwr4M9vJOgDB ZL0nERrQXNf41dw5QUcx9mHKx+NZoUpK79shl4eQUPZq/MsVhoJhCUfbur1dgM5YEstH o+PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772204259; x=1772809059; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zlLTj0y7Y2UDiHZJN3yQ83CVzgr6tgOutiukjeniWzU=; b=i9MqYvQjpumAOsXAHnf6RjEUeBECHCWHMJH/3TiAYBWTGu6dyhPqQ2upBepnEkbfNF 3wAzBzT/lmwX9VDCqOhv+W5Psvj+5fmWOINPgp3ULI/+xBEDn8/cuZkWXodqGnZqlzPx VngIX7MeW5fWybQCJCXmf5uKvLpzNpNZrC+5nPHO4UXt5MZdkHEfOeQVKnClZfCmhr+o rLTNHiU99Y6UOUhRCaUkmmVn7kMIbNM7fBHvlqudgyivXHM1MdVNqkoGxfS/+qip4yoC uwwd5ETuNdveJ9nrv5BTmdN0y5oYdobOTiYWbLpGM8w6cJq0nd6S65aoiz9O/sAPdH6i oIAQ== X-Forwarded-Encrypted: i=3; AJvYcCXpEZGq8na/s5MPChCymdYHei+h2mb/gBOBUJ0Od5GuetA9lA0mNzK79kvSsZy+OsPsQLpP@ilbers.de X-Gm-Message-State: AOJu0YxqdHmdxEb9HfcT8dx1V2QbeVIWC/o3uhIEhCyQCRFtZ1EVTRCY ugjoEIinverLstAEaMB9IwndmVTRUBebbY8ez2sv4QRlPYKEnfnhxrDo X-Received: by 2002:ac8:7f51:0:b0:502:f26f:1368 with SMTP id d75a77b69052e-507528a8360mr37976381cf.63.1772204259081; Fri, 27 Feb 2026 06:57:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+HNkRatFE7gMvPxTLTZyRonbtSzkRDF4NWbMbYXOCH8OQ==" Received: by 2002:ac8:5d15:0:b0:501:47f4:eaf7 with SMTP id d75a77b69052e-5073c12fa28ls48407431cf.2.-pod-prod-05-us; Fri, 27 Feb 2026 06:57:37 -0800 (PST) X-Received: by 2002:ac8:5d56:0:b0:501:4bb5:51a2 with SMTP id d75a77b69052e-50752892229mr36755771cf.53.1772204257526; Fri, 27 Feb 2026 06:57:37 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1772204257; cv=pass; d=google.com; s=arc-20240605; b=OVkBBA0r11Mj9wM9cDDzrb+r4MjNAAgOFD36V9R98PqdG5gSkknvmbtlJ5YWTBIKBi oLiJCH15g4WkCCzLRvIhu2BMRIQC5Nf7YbMYWlHzzh7LmTzD/lDSBLq9ll7D831vvJIY Ty/HxdLbTxR6kTIDwLlpQtN7f9MarLtxY+k66alMwNCY3+Gcu33LoU7mWRJQJBTRwjX8 N34Z/XrmGuqW96+KYhBeR5iiHXDk8gsiz2OTs71qFQJ6HWgjnwlc8JhVyAhSrFGdOnJA RYIIVTBlgsAfd6wLHuRzqs3xFwEQh1MaH2FeUbnB2G8YQnADti4/5DcyVvWNoUJDAIVQ AyoA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=TFHtb3gsbUvXv7obkhpOjd6JYveHs1eMiD2C8XHOwcQ=; fh=WkhL8kaJc+l2wQon1t06Ej3uvBGj9sVhNcE8PaS/XbI=; b=I2PT7U8xUoG08yvQRTWyXyIdHY1i3T2j4RWtdsVgVDNSlCbhEn6fHpY06RolAvHVeF e/IddQQBPX7+dZNMFOph8hasEEXfSmWX9oUVtiWtm7kxfmiyrZLS6M+hxCqKzRnflHFT AC0mtnqHTIKMpn5NC0mHGo0c8/nHxF7EVnS8JWveAIk4GxpZlYMwn5OKebN9FpAlbTGc D5WC0KvpDvK+eyXBMWf3F20Z+gUO+gPk6RWU4zkN1xoYogbJcMAa3yRJM7+KSYJBVQVe EoNmOYqwoqXAOOC4oIVX5udhrP0r7SGr/5HqpHj0ZGiNqGAkNfcZ2Pp2biwfbuICdmVR c0MA==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Iz776jIw; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c20f::7 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazlp170130007.outbound.protection.outlook.com. [2a01:111:f403:c20f::7]) by gmr-mx.google.com with ESMTPS id d75a77b69052e-50744aa1c73si2131551cf.6.2026.02.27.06.57.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Feb 2026 06:57:37 -0800 (PST) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c20f::7 as permitted sender) client-ip=2a01:111:f403:c20f::7; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Y7l+iNFLLhjbzg4XYNvfCdsQ60fZ/OhK94p9rLwNAwxLSmueGwb95j7PkaeazPd5pGv8t8p9fqN4bsccQlK7BJzXGAAWLIj9fjlsfQrZRf5utrlsQVLsGHK+go/3ImoOKqX42CBFS7G5j1rTmxjQf+n7AojrXO1ss0fPW4k11mS6M/fpTZD+XCi/rxULnWkR92joFmhRujxJx4Wkj0puFcoHmIB9hPNGIZLzAZWUqmLFLsXuL3m8eOIBF6BfMR7ob2ZnnNWw2wAq4dZg1eqBXqP4BU1NKXw72SJX8ySI7or3gfJDa5rdJ60z3W5ny46/lTxjxF4oLbpljG/jpGAnzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TFHtb3gsbUvXv7obkhpOjd6JYveHs1eMiD2C8XHOwcQ=; b=mKxxmwa5Ah4gO7AVEKwCA1rtcYK/da/uxQy+jkbdNzA5gvt/V96QfBtR/Xn1Fg4pNw/zbbkTNK7V3mOZQGbT3A13oX/0PDyvqA0Zmo/z/soDHvp1Eb1QUGvVV0rlhyYT73WtrE6fvVCDWW0YNEE7OnyYYU0WYmKp19pBgaC22CQvC6jFZJUQOpNE5JkBXw0BroQ7M8dol/45oKiYxCe0yKe2HHKW2PKMYOUFgDF1+vVkVyWlMkElCru40CHp/ibYpvYwVCoQBaT0fmmuWbkbY7bG4NWyfEwHmLf80Xrd1K92CWeCuJHCkEAmYr0j1VYh+CUoBIdKl0MYlkm3Y1KpYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:47f::13) by FRZPR10MB9889.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:d10:1ca::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9654.13; Fri, 27 Feb 2026 14:57:35 +0000 Received: from DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM ([fe80::9412:cd7f:3f72:92ab]) by DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM ([fe80::9412:cd7f:3f72:92ab%3]) with mapi id 15.20.9654.014; Fri, 27 Feb 2026 14:57:33 +0000 From: "'Felix Moessbauer' via isar-users" To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, quirin.gylstorff@siemens.com, Felix Moessbauer Subject: [PATCH v2 05/16] bootstrap: move cleanup trap to function Date: Fri, 27 Feb 2026 15:57:05 +0100 Message-ID: <20260227145716.3794146-6-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260227145716.3794146-1-felix.moessbauer@siemens.com> References: <20260227145716.3794146-1-felix.moessbauer@siemens.com> Content-Type: text/plain; charset="UTF-8" X-ClientProxiedBy: FR4P281CA0274.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:e6::18) To DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:47f::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR10MB6828:EE_|FRZPR10MB9889:EE_ X-MS-Office365-Filtering-Correlation-Id: 1371b42f-f9c0-4174-5e81-08de761089da X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|10070799003|366016|376014; X-Microsoft-Antispam-Message-Info: pLhbucUmcGriEMPdAkU5UEfVfiRckB837EstIHDA6BdYfm4AyP5IVKiI2L5FoAUcqpHDdditsO6/L+roZ3SSkaMncG7pyLGmCtEM7eBJATsP2T7FUAUKzS/hJjqPy7An1rturJZSx3mrtlB5LHavR0R8eym0quJ3J3PDVXKtr51ZoxgLweDTkNbVRq/43HvKYTJGZGpm/9EYbPYq0IrpzeT//bSC/59/TrrxJHDshfWRgSShCb68lnN+IVHQpZSG19VpHNSIQTY+fu+17++2VbsuAjmzTcLGVoV1yCnjzAOsk2Y5L5kg4f5Wlv9pINsVMEemYEAofkcQFk317kZ8Pr+H22HTRT9dhkAgK5eA9z0F+8IISjSGp81eWLVkjAeDN42Rhc8ozJ5TuyvhaROVpfYJrImeq6xlCNvXYOyE64EphK5Ams50zBeWSWIt+wo32mosrrXUVmDRkeOT2AjkfJEk/dSRRA8qReqwK+zniHCVSnE82H8/LbCj3o3rh+BBIpdHIHLhxxvUnTR+XveBu8rulTluwXXkTvQPOkryHA7mnb6p51iRpQHLZ2a4NKHazZEA21RIEkUTh/MlbjeyiQbTDz7P7owW8icF1pBpYeFXc47bjl1sVhn9Z7+sd7IFCIVbRe1qdKL3v4/ujHN+U3X6Fh4yPFThE3HSyxHOJUa9gxz1s6U7GcIkAnGI+RIsZeh3RTv0zc1Stg+WhlUJHqAyH4DRGl4zduiNAbLCqQg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(10070799003)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/sGc47JHe6EOl/BwOuhIV5KlYzvntta9keNzs5ony+xULprXq15FgFnJvVI+?= =?us-ascii?Q?7bIza26PXLaTZcVZ3Vx5sj466IjMTNMXoBMjbxIwORINQNWajdBkwj4HH1MK?= =?us-ascii?Q?IO5+08IdLw5G5/AKmwcWh34RfpCSO+Xcw6XJG2RtJOhIfKZ+RGRxQMDTM8of?= =?us-ascii?Q?FcfTl1dRLsP4Mpp2P35peRjZGFMVxgTRcrQHEgNay+T8evcViasVl3f6Bn/8?= =?us-ascii?Q?R7rMIzMFO0dTt553DHIu+R/PaPBRPDXD7vcAK1iSPteE9AHAHLzxKz1Xagr1?= =?us-ascii?Q?XtbrhfeFn2RHgaDGIcfoFwKzJeeJcuPiwco8qQYAdUl1efmnZGa3IB+/YXIN?= =?us-ascii?Q?azwpIEV001VN+MLCI5yLNQrbG40NT3tBNiH6UoM02IP93Nvuwes2N4CzNPW0?= =?us-ascii?Q?jg4OV1YAO4ejeh0QoparHWiCFxM45Um/0x3V7fYOB9Ql5mVY2OizfeP8wrNx?= =?us-ascii?Q?lAeK2K01iF20RZj+I8Q/GzcOZw7zmCS9HqtmAzwP9smnRnDk81OOTgn5GyW9?= =?us-ascii?Q?wL4JV/xPu9zznFzYpREeXMDR4AMsbrO5O+jQksfR0HEQk+AULEbfEjZBamzE?= =?us-ascii?Q?4SCnpA2CY2iaEXY8BYBDIeeIywCzTqJLYqO3u3QTgng1nwpBuMdyp3Uk2Rzp?= =?us-ascii?Q?jm/zM6bik9wyVl2/t6owH+Jnp1Mu3rZlAV0hoIR9PRhSGzFTD9ATrVz/k9p4?= =?us-ascii?Q?DJpcG5dQXY7Hm8YIUjP5wdRlSlsLWuVrZLbpWFQov4mMU/Y3VebSemC+lUhO?= =?us-ascii?Q?CnpZHogciRERxHmYOm3T/dRlqDhn7fA3vz6euwpAjMaxiJpY6aHCj4mVd8CQ?= =?us-ascii?Q?6nefxZ1To+KbldKk/IqWM2BlLwKaejEUW+77/pt9XOptENIagvXITWYtcRt/?= =?us-ascii?Q?8SNgffqwCh4MXEenm4AzC9Y1LALdI9KrZip0pDPzWkHCeABFkK3SXvQlHj+t?= =?us-ascii?Q?N7DXoB7vkCx47QZtQVjgAZ4cjlRiIgoFudMhancjqUlL5DjrLRR5LICZmDMP?= =?us-ascii?Q?Ucm4kvtN+E4WN474rQyGMOUrPWFYLkeLB3/KBiXYXb1TLeG/0hqna15/mWZx?= =?us-ascii?Q?bRzUnxnJTtwN/JBTTpYQUehua4gnAUro5fT79D8e0yomGtEipadI2ldSCXCo?= =?us-ascii?Q?BSrV4OUD14kKpMlmLK3nAE2u/1gwCW+5/UkJ2FDf6QXdzO1oVJviat/MSXkc?= =?us-ascii?Q?cMf/iGlLIsUWbdMsnequG01R2oKHd6r69DJ5JzPCvb7FF0020l70lnCfU3gO?= =?us-ascii?Q?zJG94Dnm/2taLu9U9cTIGSjW2uqmCCLv2BUlO4hBslwn5dc4q5aDRByqLP6Q?= =?us-ascii?Q?M8YB04Bi8isC+ZcKm1VZYvL2OQr9hIpefmtlfPPqjE4u6WcQRdZ2I3twEiX+?= =?us-ascii?Q?KG8bqoSIMJZINbou5bCQh4TMW5+S2jDVK8M+pYDNGVtUrl+KRN2W9ORWugau?= =?us-ascii?Q?FDXq65Pi1TVwIzLiPuPGak1lyhFV7361Lh/kJrgyj9Wj0EmOXGiClKGi2ulX?= =?us-ascii?Q?eSFv2rIq951iifzNSxZY7aLdlQO6vpG0nKT2v5zDX1T6xdEAQ3ywNxX7iCu2?= =?us-ascii?Q?g8TLBdyHkMv1r6x6tOF1AxzfpFp8+2h7VTY0EPF1ou/UQE25ruy4Vjm0pDT8?= =?us-ascii?Q?w+s4+Ft6Ir/8dBx9uuTN8f1nwTdMQ9ykmOxaB4kl2vs79vqCRGDjnGDanY3d?= =?us-ascii?Q?3U5Rr24ZF2VoNJKXMOkkH4L0c5FgumawTji2gsMf2gAMiFXebE6GPZt0SmPv?= =?us-ascii?Q?sqVTD0p/ZvvjlxQsaV0fFJpjoSnBXBgCCDFrBO45XGArIYd0efA/w6kqqR+z?= X-MS-Exchange-AntiSpam-MessageData-1: yI9u6cP8NJMv9Nswnozfh3ZY+tMiJ/wX1pI= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1371b42f-f9c0-4174-5e81-08de761089da X-MS-Exchange-CrossTenant-AuthSource: DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2026 14:57:33.8948 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hsI7+cW9k2B3vS7UoztM5zO2nq8MUzHyLiBDElL1XlTTkzcV7b2Z+I0LNGlxogezLzF/y8Rr/JM65tSsFXQMsc0/Jcy2EOJdtEkm19+Jlmg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: FRZPR10MB9889 X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Iz776jIw; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c20f::7 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer 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-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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-TUID: 8kKgc76Rhkou 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 bb254199..ea63ec79 100644 --- a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc +++ b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc @@ -104,6 +104,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 \ @@ -200,16 +213,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.51.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/20260227145716.3794146-6-felix.moessbauer%40siemens.com.