From patchwork Fri Feb 27 14:57:05 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 4933 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-f183.google.com (mail-qt1-f183.google.com [209.85.160.183]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 61REviwY015391 (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-f183.google.com with SMTP id d75a77b69052e-50335bd75bdsf220709041cf.0 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=W8T6Lt6SoLerbzP1MoqMCWMsLIYYSHg5GNct2d3/rcQvBRW2fugmNeXgMoYrjvOtV6 5LUeEGHM5jdsUs4KYAO7LeRlJakBSycK/kOFvot0GlFvdAHCWmXi/9r1SqtQ4+48J4an spce1TVGU1rdxnBk3xzW78WCUB0Xv6EwFfaivyE2qdyH//SpcXOhcNSFWKJ4GzKBAUFL B4VAawI31BMWpnfplOUsfYEDHeUniWD46lRejImLoC5t+GmCsqDaWlvbiVCU+qXiu7ux XUrLDtDyV3jgOMJez6yNqvKVpW3rj5D0owq/9VO1L0+jcrnzq9EvXRZpIXNIFiSCqo9u 8yGw== 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=ZwVDmfzkd0GVlaRW9zZhdkWtD8CnNoODb/Ld1mlyzTU=; b=QvYhHwc6nlviJynbPHOqYvNDxbl7IpJdPj4vaIDXCUsFAiZCrk5GYS5WVzoQ4xHSyB KTOVU1V2a3aOHwJXgzaQFQdG1k4AxLcTlVLSAckoc5jLr110KIErmLAKkZDqKjLGCBAN 5AfeE8mbEKDsMneTvI/6D6BFcVxeheP1cj0kfqn9wYp+Pyph5HEfjhk36dWMP+SCBs2F oVU4geVm8UkY/oZ0FOWWv0xYnMiPPDF/RDN4CdolzjPS3wHj0SYwCDqTfr+qQBn1Stsg CypEiwYk9B81VssyAIBXAxqUX95Ip4Mm7JGqif3WGhAPoIDCUOSSD72RHILd6TSF/nka qEwg==; darn=isar-build.org 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=isar-build.org; 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=UH5eHKhWtZB9Gj0zQ/Eueh10H+5+Jeepdier/DP0p/2TheC8oTXfbktnUrlalhfLxM PRZ/H3Qdpnqtjrt35WMXexI6qvaWDgoZrpM0MVmpbuNLRmZDJNSfdhFh3TcZeZU0zU4m UrsdIKW2qI+3zJfI3oFNtv2qbDVB8b4JgAqk6VlrMtdYHcWX8Ko2Krs3ydJCZcJEgvUA NItPCnwYVpuAqnD+v5ogWd+hFOAInPb5buyxO5DgnN0lQQcKBA6NZxwg8i2WmLAyBSfu nUcGYlt2GWtqnEVJEUHaeJCBLuJ8KNCn/0of1uge37uW9gElQqWad+FCIkv+8KVUbGF2 /DTg== 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=u8S0sW2zMQiuEONjysLr/Iomz0uVCShsOHx1Tkq5yqCXCIMhsPWQWUtGsF0WOyLGua xCfulUeptzUH8SC1MKyDQwdx5hj3drbe1DRPCQkObP6MaNTvbrc7uHwyDueL386SpYDw vZb4zKxHgkEqZ1dsOcpcEIwPg07RHmIhSOJG4LRJlWYWVdmZs/lQrhBMk1pZuwO0FKdm XmiTFsYJnZO62gxm//24WOH++8OfXCas5O7zmeeNW29p2ahav7tuJP0mNKGn/3ZWu0WC t2fC/jRnu8qQ5z118FoLcIqi0XTK4EUHxhfeBIgZchgrttYQlvktlXZiH+ejovURdZpO QQfA== X-Forwarded-Encrypted: i=3; AJvYcCXlcH1JachjCvyQ/zfcU6yz/lyC+62nROVLSgKos4/pWI70akzF11sFxH7IAzi/lRTsVh+6vpw=@isar-build.org X-Gm-Message-State: AOJu0Yyr36utwxDmdIrIx5DJg5nX7ZBRh0V9O9OCYuxYiY2NtMfWDJCV qiFHLTXiqJMrbvM6+4NUdQsqrHIGjNPBCc7LhSr5zXdukgvCNOYxVktj 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 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer 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> 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: /sGc47JHe6EOl/BwOuhIV5KlYzvntta9keNzs5ony+xULprXq15FgFnJvVI+7bIza26PXLaTZcVZ3Vx5sj466IjMTNMXoBMjbxIwORINQNWajdBkwj4HH1MKIO5+08IdLw5G5/AKmwcWh34RfpCSO+Xcw6XJG2RtJOhIfKZ+RGRxQMDTM8ofFcfTl1dRLsP4Mpp2P35peRjZGFMVxgTRcrQHEgNay+T8evcViasVl3f6Bn/8R7rMIzMFO0dTt553DHIu+R/PaPBRPDXD7vcAK1iSPteE9AHAHLzxKz1Xagr1XtbrhfeFn2RHgaDGIcfoFwKzJeeJcuPiwco8qQYAdUl1efmnZGa3IB+/YXINazwpIEV001VN+MLCI5yLNQrbG40NT3tBNiH6UoM02IP93Nvuwes2N4CzNPW0jg4OV1YAO4ejeh0QoparHWiCFxM45Um/0x3V7fYOB9Ql5mVY2OizfeP8wrNxlAeK2K01iF20RZj+I8Q/GzcOZw7zmCS9HqtmAzwP9smnRnDk81OOTgn5GyW9wL4JV/xPu9zznFzYpREeXMDR4AMsbrO5O+jQksfR0HEQk+AULEbfEjZBamzE4SCnpA2CY2iaEXY8BYBDIeeIywCzTqJLYqO3u3QTgng1nwpBuMdyp3Uk2Rzpjm/zM6bik9wyVl2/t6owH+Jnp1Mu3rZlAV0hoIR9PRhSGzFTD9ATrVz/k9p4DJpcG5dQXY7Hm8YIUjP5wdRlSlsLWuVrZLbpWFQov4mMU/Y3VebSemC+lUhOCnpZHogciRERxHmYOm3T/dRlqDhn7fA3vz6euwpAjMaxiJpY6aHCj4mVd8CQ6nefxZ1To+KbldKk/IqWM2BlLwKaejEUW+77/pt9XOptENIagvXITWYtcRt/8SNgffqwCh4MXEenm4AzC9Y1LALdI9KrZip0pDPzWkHCeABFkK3SXvQlHj+tN7DXoB7vkCx47QZtQVjgAZ4cjlRiIgoFudMhancjqUlL5DjrLRR5LICZmDMPUcm4kvtN+E4WN474rQyGMOUrPWFYLkeLB3/KBiXYXb1TLeG/0hqna15/mWZxbRzUnxnJTtwN/JBTTpYQUehua4gnAUro5fT79D8e0yomGtEipadI2ldSCXCoBSrV4OUD14kKpMlmLK3nAE2u/1gwCW+5/UkJ2FDf6QXdzO1oVJviat/MSXkccMf/iGlLIsUWbdMsnequG01R2oKHd6r69DJ5JzPCvb7FF0020l70lnCfU3gOzJG94Dnm/2taLu9U9cTIGSjW2uqmCCLv2BUlO4hBslwn5dc4q5aDRByqLP6QM8YB04Bi8isC+ZcKm1VZYvL2OQr9hIpefmtlfPPqjE4u6WcQRdZ2I3twEiX+KG8bqoSIMJZINbou5bCQh4TMW5+S2jDVK8M+pYDNGVtUrl+KRN2W9ORWugauFDXq65Pi1TVwIzLiPuPGak1lyhFV7361Lh/kJrgyj9Wj0EmOXGiClKGi2ulXeSFv2rIq951iifzNSxZY7aLdlQO6vpG0nKT2v5zDX1T6xdEAQ3ywNxX7iCu2g8TLBdyHkMv1r6x6tOF1AxzfpFp8+2h7VTY0EPF1ou/UQE25ruy4Vjm0pDT8w+s4+Ft6Ir/8dBx9uuTN8f1nwTdMQ9ykmOxaB4kl2vs79vqCRGDjnGDanY3d3U5Rr24ZF2VoNJKXMOkkH4L0c5FgumawTji2gsMf2gAMiFXebE6GPZt0SmPvsqVTD0p/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=-2.2 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_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_PSBL, 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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}