From patchwork Mon Jun 1 11:34:52 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 5093 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 01 Jun 2026 13:35:31 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oa1-f62.google.com (mail-oa1-f62.google.com [209.85.160.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 651BZUdY024548 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 1 Jun 2026 13:35:30 +0200 Received: by mail-oa1-f62.google.com with SMTP id 586e51a60fabf-43d10d3f8c7sf396187fac.0 for ; Mon, 01 Jun 2026 04:35:30 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1780313724; cv=pass; d=google.com; s=arc-20240605; b=NQCGRa/aYmgA68fD95z4XZl89GZYxEHzTxkDYdBkYc2JNQtM2RL2QdgDRQvxe3A7GX F55yavFn93Z/32S4uDohf5Di3TvNbA0YttWAKsSkXotR4yIlSWvcbWx7/Vb8tXrZEZTi ScdunpcVvv/FZZkQqKCVDyNnDzRkesP1LSINLbHDXXdYr8ixwJZqQLg0pFVClnlUL2bI OdLdfxUehW1L0Lx6Cc5clnyQqrshUfej3c9TmMxKK1AquarbNrFLb/NX7EomT/bz9H8L +br5oK/M7PlrYc/O15qctK8ned9AdUrIbg37dt34s8Oijq1BN4+Zih2A2El+zk7Ak0UR Tw4w== 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=9QTm4aIgEUZ0Eq45EdOeiQ/+knjxH6PgyqxSIMOBvV0=; fh=Hl/j8dqgj5/6jhy82DuPISBJEAaDwqTJftmBD2KzdEo=; b=VARkfckW6+KudeoRVXX29o4+0ShbyJNMzMsiXzJ530EtmhtSPlhrOmfqqqHRUtJpqk Cxr4iDTrwiz02qxO6VChly3T8Ju2+vgaiGsuQAVlU/YZm3SL4xFNEuTQHNqKfhKbpFmm 5Fu1nibPiG0zDFLkPdi92VGRtUJjPEiED8ptpBS2kxl4RXpuvCQ6ryTvg7h4IM0QDJXz 2F4uRDDCwPq5GGm7nqoqy0EkcEn3E6EPAsR1nQTxTrGQB3PKUE+blf29HTr632OZRfz3 QRCrPb/8aZRwzFhBBd0WnNTWVrzPizsl6IwjKrkBfzteJWkljUmxPAKZDZov+I4RjSeP O20A==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=AZhgOY5p; 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=20251104; t=1780313724; x=1780918524; 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=9QTm4aIgEUZ0Eq45EdOeiQ/+knjxH6PgyqxSIMOBvV0=; b=kduvqhewfXptGz0xrczEk6jkKWqAervRX6QyevW9tMRdoBognN1IZPt8Aeqb1ztUan uJoQFbkOByo/LRjQvR98C1ILWLcXDBp4L1CYYPK+BTAZYHwaweyGqY10GwKH51aX4cew MPKMoOB3kqbz2OInQzaGtUK0HUD3aqoATH0o5lCGZiHhY2dAr9snq1R7MkqrmtXlpvem 4gFUQcOs1QPouTDC7Idme13+rwZ7k8APv0pWHWNBrjxRaxRMR9fUWVimGjn/nCzUFy1r SZ2pRspxjc0J+MLeXgj3LrDPwq5nrFh8ybV32gPy7gL28zLmRAjtQ+xpFUR3srpLQ5W+ +7Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780313724; x=1780918524; 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=9QTm4aIgEUZ0Eq45EdOeiQ/+knjxH6PgyqxSIMOBvV0=; b=ihzuwQgCw1GUH+Y2ooUSIKt927zK+MluLsAx2QSuusCvRYMmdyRjio4Dhx5pX0LyKR vbutElX3wN0qRHLOKC7PNOEqs2pYGkX0bnWlvdf2LG8enyY+MD2R5rS96SSpC69xPdoh Bm/o9d/9PLQe+pUA7gaa+oK48fDhhlmSYJ+yUzUEYODxMBS28t7/AWMNfLGMvNZ4uNVP DmJfJeJmNPv/Q1IKJjauoPaPAhtZ86i+gRw8abMaJmPol32l9eYGkl5BazZ6K4iHf91+ BZQ5w2gd5VHFeOC/iZeqEi5iuBzBrRayQjx78DxBA9pNu+Dm/swQ0qBPha2JUWQmihtv 9sQg== X-Forwarded-Encrypted: i=3; AFNElJ9w6FigEPWWEAMyz6KG10ntzSK/miaD+/90TwlkN448k+eW08puYtjBQ4gBKEzaN1a2YB+C40s=@isar-build.org X-Gm-Message-State: AOJu0YzcZHG2ecit1KfNU3QPoAVbhsOA2H7DLWp2ygqaVehvvdgN9gx/ ssV30V9xmRyMcjFqdaXGjqjdq1xORAZeyQAj1ERoxxZEJGsRewTemKkC X-Received: by 2002:a05:6820:2219:b0:69d:9547:c963 with SMTP id 006d021491bc7-69e102e3a3fmr5864194eaf.27.1780313724079; Mon, 01 Jun 2026 04:35:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AUV6zMPb51qB2ITCCGSFqMc3xFB39xan/zajpw67wW2lf8PCrA==" Received: by 2002:a05:6820:a205:b0:69d:97bd:3588 with SMTP id 006d021491bc7-69df447cb70ls2155988eaf.2.-pod-prod-01-us; Mon, 01 Jun 2026 04:35:23 -0700 (PDT) X-Received: by 2002:a05:6830:3814:b0:7dc:1615:7b52 with SMTP id 46e09a7af769-7e6a1e7b15dmr6596981a34.26.1780313723041; Mon, 01 Jun 2026 04:35:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1780313723; cv=pass; d=google.com; s=arc-20240605; b=bM3xFjq9VyqWHUNFCoKorwgeCiXpHcUVByq/3UcKL2RbqymV7wj2RGUgo41DEDOGvi cBHvwRuP/4qzsrY0njF3Y/xmHqL2uTd+CxwyNdmAulML51/czfC7GiaERMSf6ewSpg1C 6eidd19AQnMm6Dyho8DY2kEtpLZrRtiAyP3AQuN8YmGJmHWeeaerdtIpBT4u7c38uryg 6AwvUdiloU/9XAPWEuqCzjujz79/hbUM5Hp1KQNFIaQEcACyPAgrMj2c1vKYaJNG623M 6O16NkEFnnktPO3S3LsU3ao4Gv8XWUGSNI750o3KfVqnPHcN1JPV3BDfo/CqCHqEEbWF UuPA== 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=eLjm3fVFi2E+spo+Jm3IBFrrpOBotY5SRT27nuVLz6I=; fh=WkhL8kaJc+l2wQon1t06Ej3uvBGj9sVhNcE8PaS/XbI=; b=L1jYI/3I0Te0qJtksTmVa1TtxQ/rKjxMSHkiA8xsp7GHhEwRU4s962Gh9VRUeI2119 6UB4xFGS5Jjbw+gC9gxpJBZqbm0cmhyF+oB45ITUNoiUiRQuAXh7YFPeFkhHx8Bdk1vu TyQq4j/EK2fqDlXIPtRFTCvfiqg66xFVWB7Rfl7huVHpRFe6PTEydme233I9q6jieVLZ kJY8XG/jfBWWnIqEyQBvuYhk2jEkhcNMbyak1Hc2fEW0dh3L35Ph/TFfcjtxnzXqLWDR Ska0cJFR6kSne1oT0CDuXjnvt6C+V2BgF6UIrbmx9l/LmetHhOGBMGMLiwwgEqUYV864 FczQ==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=AZhgOY5p; 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 46e09a7af769-7e695ca31d8si351370a34.3.2026.06.01.04.35.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2026 04:35:22 -0700 (PDT) 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=awigZs8PIRwTz6l8PT5JRXNHHdxk0GpiBBjKciXSOWAD6OU5AIqZWbqyCBshiAR+2uVx6yO6UF55gio628fCHAREzFSU1l+j/te6etlH3ve8WZmYu9ywDb5dbWislB2ftl0JJtkJ5W4NN5q4rDWdLksO7ZHIYRyZk+PiivLxk7c3grRQ+71luFGOlhD30A5u3NR9I7+OuKaDBjZll5CmFEVcURbp+kj97jSfJBOrlEhF4lxHeob38rsgs2hGnEshESHFshcrygm8M3yv+bNBXwfDsAXQvdC3glIcF0VY4L2i+lA8uaYxg4PB0rxiRZp98Z2NYFj+UFImj5Q5nrogcw== 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=eLjm3fVFi2E+spo+Jm3IBFrrpOBotY5SRT27nuVLz6I=; b=v/A7Dhg6YQVfaEQPTy7+BO5X2gDrWjZYCXm/1FlobvZGE7px1Aha7mVOLm/RfaurCs9ctIEg5boUnL6y/OCRi2yQ/vo/ZMD21bpgVIopPd2WaR2Y6JS4tRPUaL0kTBTBzDJv474iqDP++gViGFEvZcC3gOmxYIVc0+j/8CPjhLc06HoHabvBDSk+puPJmYfKa1iRVOqJT+Uuas/soRGnWfYStcMpMiwPjOrkmv1aiDZrU85D2tlstrpnFCS5AnMwpW4x1tsd4M1JaiMWVu43I+sqy+ljJnTW55hnG5G6AhkGhgKYAjrHmt613yTZA+T56yNlbxrfHoiWtBTMX6erkA== 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 AS8PR10MB7254.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:619::6) by VI0PR10MB9577.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:800:31d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.71.15; Mon, 1 Jun 2026 11:35:18 +0000 Received: from AS8PR10MB7254.EURPRD10.PROD.OUTLOOK.COM ([fe80::c0c1:ae4a:a803:8b8a]) by AS8PR10MB7254.EURPRD10.PROD.OUTLOOK.COM ([fe80::c0c1:ae4a:a803:8b8a%7]) with mapi id 15.21.0071.015; Mon, 1 Jun 2026 11:35:18 +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 v4 05/17] bootstrap: move cleanup trap to function Date: Mon, 1 Jun 2026 13:34:52 +0200 Message-ID: <20260601113505.2898877-6-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260601113505.2898877-1-felix.moessbauer@siemens.com> References: <20260601113505.2898877-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: FR2P281CA0129.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9e::16) To AS8PR10MB7254.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:619::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR10MB7254:EE_|VI0PR10MB9577:EE_ X-MS-Office365-Filtering-Correlation-Id: 1e3867b6-3785-46fa-dbca-08debfd1db1b X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|10070799003|366016|1800799024|55112099003|22082099003|18002099003|56012099006|11063799006; X-Microsoft-Antispam-Message-Info: BOD6aR8VTtE0N1qrbi4jDNRReEQviWkp2y6JWdZkZrRf9qqbnpHF3kdVReQaGVGEUmVIgb102XxksaXd8PRjGi7Tvs9bvbmd3F0yLfpc8hKPAqi3XC0TDKCW7G2xZeWD3I7WINev0k9nfMp3fhBe0faUeHxMGWbcFxtJJfEeR8BimOJVoruvUglOeaGRRs4w++H4HrODkLNLzUz97B9Rc67yAtRFnGSV4TRoLcEBEUCq1pjS2ggNKegl3TNf0/oi8cgl/fvy+n2r84RNfXvs2L6ASfdQ8P7OfHogXX679quJHl9ZFi3KOm5KCmbfpygfToqO+oY1OFqfWxU4+AY9Yw97kzceXDP+OWedUwnnxxVSLIq4Z1s6uldpLihAD9kBbiJsbqg4eDdAfx/QeY3SA8rt6zL17bJTh4qVDOPqNJgcnosVlU/maxsFHjcl2GENmyXr8d1hsdCqxJfFxma1rGz507OYldX7aGk+cMtUKAnBHmMMHgQ01esxPmTAmlB68D/aZ6ofe5yR9tTIjq+Ed7hmQwWsyD1pmu8xm9bGYSDBNUqn0/gdm/vmLtecrBJuQPmFi0chMzULOFOhZF0a8mej8+7nzy6IYsSgqaE9tQbwY9dOhJoD9Sq+424mPfi1sdFEDE8jtNaie1RWhgp6T4NDwNDkmrZMPGfe0FFYv5USlDoHve6Vz1JC3ZEEo+Hb X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR10MB7254.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(376014)(10070799003)(366016)(1800799024)(55112099003)(22082099003)(18002099003)(56012099006)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: 02YHKMjiX7zfgN210sL2R6NET44HEoMDo+YlrC49jlDUCV1Qkfy2QRrNlmqR41YkGPw1oA21U+iboKiPYYfAMIRpqJQ84NfnE4k3B74GSJ+Fb+NRSwLs3Ao0z3qg6INuCh9CglM5kgYSJkCJwLGTqSppBIEYaGiPyIc6W6m7/Hc7kklqF1Pc0rJrW/TVRzGjMQ8ijUmN7HfS5bR1l2/TlXP4MIqesMqrlIHHBbSoAAqg6802Rj8YyPK0u2t30HWZEBhXYNxwgMsiKcgk+kUVgV0vHxuVXuipHAQw+749Pb0n8u2zny8JthpKf1edYop8iuIgaYrPUyfJpny4d6y+nuXw5g59AEwLsgn7Y9zXiSRaDxo0zEvVtiMnMdq0gVt5+df2pmsLsCpdJOxD8Qg7UlxkYFJW+btPNRfIqdw3XGlUee5d8bxsVBOD9uc45T3BlZZA0P0EEerKS76kRp5tnA3ynphqcxEojnYZNnXaiZCrZ0bvVz7piDpYZLSnVS9pst0ZkiHNUqAb4FaXFa5B21DAHroH0AtTwP71coYkUqWX57mT9XykLQXC03/BFaMzd4yEnrgJok32+WHQWAgHEAmTVCGcIHSBsKI/b50fxMm6iXI9x0luNgxGMcTEukYVp9/7UKWcWjiAeVuGXA1wnflYbnFayVvJzVpkjjQbQcLXhH958cBMh5tJkzOcKm1acH7aRN7F8TTJl0LcHSfBVb5CsFj6FETu5oF1/I7y/Hd0cUlSKgm0/V1r7Qu+uzPVXlALEu98mU/8ITP1LGza/Pims/Hqat+MAN2TSFtn4JN/FVpoEXT+pX7hNSSZeQf8SkVvtnmDqkB/fUnE0awcNpgKzE3eXQdIBCtB3KVkSGp53K9MeTLHP24U3MBg8oa+lHJglvSk15OBAuQQyfbtkstnOzo8FyWPw4CHg29Ox2TEcz7cCPZqVfK7NRQdiUJ0Z9oc3pSoRaFZDA6Tg1mF+2UpeiVOwktSWQuavNWGVV7v9B1ix/fqlyumLTayU+hUPLvU5l6IVQqThgh7uDxGjTQAmuYoGXS1aI4AQyovzR3o7OnclVxWjMUKFMU05VpGMAKiy+7RGuB6dgjS6qsaUB+gWMOgBJM/30QghM4U2FBqnrdnGrf7zm1JGYbSH2hBPMlY7/I80RO3KAKoF2prcsfp0cPoSO2+qp5iokHt486EsOOyXgB2MNfPpZXi4T+YkZLrytbYIptZqYzAf4Wi/7A5r56RBwe0Mcjo+WnqINWCyPNHxq27F6v7UCZA3RQ0Ga5X9Q6kjigA39qFUtMCnxEj4Jf5HrabMIHwebTcl4ZDuHj59zWz6URqPrWk9TiHSPfAPI4A0hcxUUPwADUHwS2sqqasW2T/piWMkvVSNSA8ALDwMHe0la0w3Tp2rUCEi3EVOrGJe7WP2sD5AXCWkOpfyYmYFBs89SVWBALXf1N8g5P5+lZ6RSzV2ABwXsZM7FYd7aDPIkZ7LGhgih7rcp5T8jdWIQpvYIbaNWhnCBOKQtDVkBWNaQxnXgxLsw3lvFh+TQ+fU6N0vDEzkdUecRT0bpRzBziyW8qAD7e6h28sTOs+kukG8AOMXJc9Dm4GvcydKb47pPFdLGFKNXE7CD/icwX6BkLF+pHABI2n+vtUjPqpF7a1F23uxKiF2x5QkHE53L0ZfkjxINwnt3Hd0CkrdXK3cWxFki/CYMDSrL5yfeDCIZQuyPKyYvCu3OYzhOeBrjdUL9hgwIcSHVd8G74QR3uoy8zxMv9STFw+F7BPjfy26LeEG3PIP60+jQAQ2INA8eDr X-MS-Exchange-AntiSpam-MessageData-1: ejwvfw0kVRzQA/lDerTn0bkBI9uFp8GbW/Y= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e3867b6-3785-46fa-dbca-08debfd1db1b X-MS-Exchange-CrossTenant-AuthSource: AS8PR10MB7254.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2026 11:35:17.9531 (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: 7IEPZF/ZTIKveFYIAa5IPqPPnrD8bVC/bVlz+qKS2CVVT0rmQEZtvxSEnRT3gSurjzP9a86Qc3fHS6UxmTixwNv/qx98SNAXpNQUvhHVg/Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR10MB9577 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=AZhgOY5p; 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_H3,RCVD_IN_MSPIKE_WL, 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 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}