From patchwork Thu Jun 25 15:36:39 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 5178 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 25 Jun 2026 17:37:16 +0200 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 65PFbFwR004444 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 25 Jun 2026 17:37:15 +0200 Received: by mail-qt1-f191.google.com with SMTP id d75a77b69052e-5178aed25basf32655941cf.1 for ; Thu, 25 Jun 2026 08:37:15 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1782401829; cv=pass; d=google.com; s=arc-20260327; b=EJe40x1ejsEH2PT8TMg5OkARjINvNFa8Jj+XOFhysXRAKBh4SKJWOOpYGnRR0YYUGX Nsaosq2Q1J8H6c97NV0YjrTFxhJwVjT49L1jo1NDPSP5XeofTKhS94GAu/3m9VdPDCnC Gs+GnT16hH9CEa2iHUutaU56lBFcj88d5j+aJ2N7o7pWaHlRmBIyuf91qot0/wHxoiAd TlAOnFY40twFr2CEzvkLQUcRCrVzSWAksI+jGvVif93+O8S2cKNU9pz+I5es5f4O7u9N TuQsj9k2OOQKjOgWaLFOrJHXMJWbxBYm4nUSzhoIEd1YzxwyEpOk8NaZQpk1vYJjT+20 XkGQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; 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=TF+75dG+/UzWOHmydc8V6SO61ocaGYDx9ZwekcoF7hQ=; fh=Gj51RwGZDXstcdbpyCZra6ND5lOP08Ex5BuDrq5YlO4=; b=FHr82I2KhCYaZ9bdasC1Zj0GsNjSNnX1fwL5leB2EA/TfFwYMeIcATZVC3oQJowOU5 JkCsT1BK3BQnPy2iJVuYJGKc22cKa/EHjFKiXBQu1moaIITXSWAJoZrGctm9gdTJ0q4m JUFFSjdiVPiOU9orPulPWSiy1skBi7SLu5mwdenWkJE58uX+yfkDTOwqcbFVpdnckTkG ADXPgFhCSK0uetujkIBaiNKi4bJFxVJ1S89jJhSvb3iNkGFueNBTKxQw8zFM03ZszZxt QALOObsC12DWsx9azZ4trB1qExIu7oeiWDo0DmNZfvJJo8beZIvHz7Qygh1ngU/nPRoS g/8A==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="iu0JB/a7"; 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:c202::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=1782401829; x=1783006629; 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=TF+75dG+/UzWOHmydc8V6SO61ocaGYDx9ZwekcoF7hQ=; b=KeaCFbSoykUsP280YdN945zhePm6dDUUBZCBWFU3CIl3eXbVQtLVaQeEgCXDJJjRm5 Pt5GR3HREeL0QxEV9yYFesaoZykaa0678pdnN+vOMWlQGnfXRlK4t2d2ULOnE8Ucivwt Y006E84UdxYJfiAc4gMisUtA52kxdpbclmDFOjrFg033vYugkv1cQvqkXL/8lmCJyVS6 9aEGffv87Li0mlXqnhIx+hEgWEIuwUOo/Lk4j/not6kNR8PJvxvEw3LWLXkTTYdtEKpS 1p79TRGSenSZjHVuH4fZkvdraW+kU6ZQ+jjRYDF7N/Y7x4ZATgoKsjVGUUgvyHBLk1AO x1Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782401829; x=1783006629; 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=TF+75dG+/UzWOHmydc8V6SO61ocaGYDx9ZwekcoF7hQ=; b=WszUNyPGKpUqgb0kOuGq0MwD8kD/KfaL97jcnIYhICndkVzt63VKAobJ8qqOp+2bkn 0mlAMyVdSsSL/84HP8X3oht77lWWKMoa/Af6OHE0E3n9y7u783rvJPS5+zNVN4DvJ5PZ 9BooFytP9A8JaA65mwZWwJCCu+co7XbP2QTe79ETSPD8vJZMK4kKVrkAcKFqB0igQiHN JTCoCKFsLWV8yTe+rEqcH6JU5EWRbX2MBCRNvaY5FVEdT3r6hDQhvrFXjWxXG0cDipn8 xKrMf81jijvWyciuux4GT2kB8ftPjcUaT2AGopElG+qz4jv/skiHVdOpgLlQQH/BVyFJ wu6w== X-Forwarded-Encrypted: i=3; AFNElJ9h2lCGVJhO6UjtD0HCIezdLu5/a4yjbjIsKQh+/KHtMwutgCSOrQiBt1VnshQW9U9kvfpfZWk=@isar-build.org X-Gm-Message-State: AOJu0YwS01j8jHQb7E7anC9674oPemRgp+uNv36ZpJsCzONysWIS9tzj K3eeR7vKO3fy9OLh7GQz6ZB80XjEV3Czcp79/5aLustS05CalzPmhlWS X-Received: by 2002:a05:622a:4018:b0:517:6ef7:f6e0 with SMTP id d75a77b69052e-51a727eb4bcmr45034561cf.46.1782401829128; Thu, 25 Jun 2026 08:37:09 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AX0PUUfdE4lbrI8d4gdbTVHKfjkCXysvoLuOkEX19zRkEsugDA==" Received: by 2002:a05:6214:1c4b:b0:8c7:2c9d:13b with SMTP id 6a1803df08f44-8dcdfc1cee6ls90506546d6.2.-pod-prod-03-us; Thu, 25 Jun 2026 08:37:07 -0700 (PDT) X-Received: by 2002:a05:6102:1489:b0:607:5cd7:d7c0 with SMTP id ada2fe7eead31-734360a1990mr1389744137.19.1782401827686; Thu, 25 Jun 2026 08:37:07 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1782401827; cv=pass; d=google.com; s=arc-20260327; b=OKt7ISdVPVjMYKcVLS59ZEO4N816UvMGWavAO91QwuzfRLDR2x1xW+6u3oVT3O/3y2 W8qZw9FuZqMxwyI7AyZsa6jiF369pjAAYECBTehADAbiIsVy+GV/waN42VtdxJo7DDMx V16eOIcY/U8ToAixBWtdGHKloFqUwo+ZvdTknoggzIvRiMJAgPoJ4lgcmbpC+2/isPee MpN7CrvdOXkabwKSAZJfAwFP3qTJp4tiV4E416Kg+bFvuSj/2FxwPfOd1e/fptE3oErP XXVgMXKEkz24960kvI/K2Z47pZI3HxKdfW4b6Zc6s9fyD/QQBAqtmWMA5tFR7ztRt3PC aEXA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=jIYSQ2UlH2Lnmw7sFU9CzFGQ244XwsEyB7zq8vdR1ko=; fh=WkhL8kaJc+l2wQon1t06Ej3uvBGj9sVhNcE8PaS/XbI=; b=scoB7VnGsUrpaDMVh8se47/xoN2rCCbbR5hJy0PY+OfopAs/mCEqQ0bbbETIoZ+arh S4EVFkDQ0faTTX/FuWYWn5pFz6YZG5Uh1R7pnJ7feCB2Rc8bBWIv/7MwTM/gDKMFjf/d EfNw3vpNFejxuwvrY9qVUrG4bEPn7Ce07fbzEegIPhTo56zJD6vVIGIu6veS1tm6u7yi hBpOe6C0fy659Dmb+KkIcZ0gale/SWv9yAndAH4EEKpzog69Srr//SjmRMMoc2U2edQR QTxlG1cv8VZLjx0gEVg993tc+6JKCr+cnEncKYhb6/iHE9l23PTUo+qZ/YISsngB1ZqV Mj4A==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="iu0JB/a7"; 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:c202::7 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from GVXPR05CU001.outbound.protection.outlook.com (mail-swedencentralazlp170130007.outbound.protection.outlook.com. [2a01:111:f403:c202::7]) by gmr-mx.google.com with ESMTPS id ada2fe7eead31-72ba3eef31csi634854137.4.2026.06.25.08.37.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2026 08:37:07 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c202::7 as permitted sender) client-ip=2a01:111:f403:c202::7; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CHrCEegO9EtmkkdeOLbvepAW33GfulbKPyugqpvowGg2ST6gL+VbLh5Tzixws6uq/yTXZhAXpli2cx1QDEJAmO9TrFYRzv7mD463oOtegqAnwT7O6oxDZy5bbhsykUQOzuV03Q24KurhT2W74MsHO2oVDEj8HI16K4I/tJ9R6zdc52bqRzWKRQG8hkfRcq5lOnulugHyrs8HRrm+1aXdPgHB6pedR+tZKC9FTVnyHIRuPZL4KVbxaj2OAoOo23nyl9Lu3JJQARryXM/n57rQ7F+5MVkp4+l4eoRyosBq88/9M6xYw81sw9743qHAr+C0vdw+JQ4VnowIztnGYz3iRA== 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=jIYSQ2UlH2Lnmw7sFU9CzFGQ244XwsEyB7zq8vdR1ko=; b=WO/Ov5Pr6lEgonNWmbw1TfC5BrZPfepWmYbP7OHyDr1R7v8tWyDFj1IKPCg9WAOL6Y0+dcs9Z7ECuMozRJf+CTsWBfj4x834ZftG5qZvJ8fxI4a0spGUdPfSat2aQsvzptebYYbHcYtL4Iwl+my2dSHDOS5Z76+XM1l7cGm+mpQz18ac/FHleN6JzjRGviR9Ui706xKEfX6VCP3uOOIgtjgQaZ+7XnzNsN1gtHlIGIl6t2KOUbOVl7Yo3E9mpX07VS3CSumGF5I4ddEZaNG3+i94etRbpfVlAy/m+8PT1DFkFz9HmTmZ4K0XDaNEXjSfpTYfBi+Saqn2i5OocuAE9w== 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 AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:17e::10) by AM7PR10MB3891.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:178::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.159.15; Thu, 25 Jun 2026 15:37:05 +0000 Received: from AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM ([fe80::c54c:ccd8:ebbf:477c]) by AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM ([fe80::c54c:ccd8:ebbf:477c%5]) with mapi id 15.21.0139.018; Thu, 25 Jun 2026 15:37:05 +0000 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: "MOESSBAUER, Felix" To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, quirin.gylstorff@siemens.com, Felix Moessbauer Subject: [PATCH v7 05/17] bootstrap: move cleanup trap to function Date: Thu, 25 Jun 2026 17:36:39 +0200 Message-ID: <20260625153651.762936-6-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260625153651.762936-1-felix.moessbauer@siemens.com> References: <20260625153651.762936-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: FR2P281CA0147.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:98::12) To AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:17e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM7PR10MB3956:EE_|AM7PR10MB3891:EE_ X-MS-Office365-Filtering-Correlation-Id: fc292f8e-3764-49b7-9ec0-08ded2cf9bf4 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|23010399003|1800799024|10070799003|376014|56012099006|11063799006|22082099003|18002099003|55112099003; X-Microsoft-Antispam-Message-Info: EyFWXATyrsiqg4W+QqDSzav0ZS1F12cu+ewQXHU0EMyjgh1rPyVOrxiSDm/hR1dOLq2es83UlMlxjd8NlwoSyr+7gP4pqcsjiDAnDxWBLM/zFkn+CFAmLlnnh1DnZZ6Zvha0c1JFTFjDUN14Q4HX1vAibS0ZSgDoknvJ/lLXVfHNTMCtb3ES1/f1FKrYYzTAvNv25NxRdpbjmf8zeSq2nK6tdWf5bneo2rLb6OReyrK99pTf6OInpswcsmNacf3j0UgDycmqUJvFQTAeaylLTwb7X7xXNobwhpwjHZggT8K9mcQbc/aIWH3G+h/Xn7B4Kicj8NjX4Su8BbVHa/HNOTktwAFcPOtjpMcDaM6x/7Uj75uvl2CNln5MFKDx6xx32/ynYzota+s7+MeaEyImfvTJPjlplYd4XpqXf6Z+1QHLlvV9vdv9wBbMmx95MhgRG4J6Mn4BvuTScG2ub0/SRVlWtdfIb08MdCWcFLpyKsMYJ4aLZvVDyXfPe7YRkOKKZ8nsD2SJEdpsJyaw+Y7veY77Lc0VrwDupNRHUoV4jQRSmHtd5G/bHw0jh3rYMA05UhrKkRdcVYIYlrTRdJXLCQC1630PUrXIXyqU+BPVkrKhwMTNkKVuYt+qqnDvUKFDIPL1HyiMNW1dEf1+2L10kwLbRnyQoLpWf9UE57R4x4k= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(23010399003)(1800799024)(10070799003)(376014)(56012099006)(11063799006)(22082099003)(18002099003)(55112099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: 45Cn2bhMckdzXE0ZMlmu1Ma1KDG2XExoJd7XuJzvujsRiIsTTNnacGLcyJr94DFqS4HQLf7uL/Pg6MW3akLDjKZ0EV/qUlFFEWxV6oh0DtVCVXnGeKM4FxyCYbnu7+0/Oh45sDVCxEf9xNZPlONUINjOk7VKtlloXhh55POjbI1HTNkeQug0/jsNrwiM459vu1j7KTLcs7c6gb6bFjAHlXLramnGp2Npb/cqKaw3YSDPkQT9zB+EkO87+H8eg06tiCwBW0wxjh/8UFjNY88D5QosnPQMEee7JA0SOSfZ6D+FEr7Q87wWmSA3OPQZuA5mSJA94gpLrD2OaEpJc1nYYpjrLL8uypZ9HULYRudU2XAR9T3nt5rsZEIJFn/XpP2/FqlJIhQNEEMk0c5XpfS+nm6ahBkGKTxYvgdx5jrQLBY8poWm6kUpaoze88OgSJDaJ2EQH+sVMrYkWAVySeL7u3wH5xdojvZZBiNU+bJblat8AWCIwC62O8JhMpHdU68bJR6rs2cRzS+GLxXdC2ZhkgeJXicSPgM0hyXDoktldoSHNalsbGdjRvJrWGgNnGplMCliB+PQVdK8oFJ5QwwADN/9GfZVJw/zl8B9keJ6wBq5+n/NAgQ1AinNqVjK4FNmweAngIVUu4ahVb18MPtxVdvoUmSB5dmwv3mS5D1hhfQX42hjJNW23YaYxBe4Ybbl031veK68iG5XIsF/vSFy960jfOw0hl8GzLuHA4i7u3FDn82D3v3XpIDMnWIElAMEXgViIbf1QrCfVLt5gl8ByECS5EkKdb/LIys2bNcnH59JevWFA6ELO+1sBipfGdJZF9hwF906C5HYWQdwbPcVHshqmDp3Tu+2OTG4K3V1qtbhYduVK3B7Yvpl+pgNS/3oLi/vFa5Cu1HYS0wZIi9vwZceec169hqW0UDj5aWL/OKmfaUB/AM2ul6Hubn2fiXhvQd0f89rnbRbWZIFc7t3W7/PLKWjpQbZNRRhcefRl10i8GScr9RT8nGHcaz/ZO4mUzr4Tsv/B0038txYMx3Vo9dgZ9Q14msfsfI8e6IMjtWw51nRSrVl+i18O3tJJEJAZc3Z0k7jbANpdnXO1AD5d6FEOpIuRRxCDZLExRoxuA1uERLcZfa4kqtDvcuwiYhXT+9+UwDGA2aWlHQnYOo2yWVh1cMKt8Diz1yC+/YDj7JPp/X97Z5wAz58OQFep+OuFEvdv7cg1QtxX8sKzzqGv3Z/RzWxIVJKBw/coXARrBJENrH/kccawNa1B4EV61JcHpt1TMtwzY/Mct029bbFVINYYCTTvCzvwxVbs7VSLy7ltzJbjeQMGGW/uvLfUsITTolM4qVHwi1o4iQwcpbKLRC924+t+tD2rVCrwHw0U1VOJMfErrRaCWVZy95rDWMgxgiO2k0pUHYCbgtfukU1I3n4q2a14T4cl03CQXSDYoATAy/N1UYpoK/tAiYH8Osqio0ye5L2Hnzqye2i7SVNUWN2bVkwQcaO3Mv5cpfBNamHiK/CIFg1HJjCVygp0HKrl1zlefhEXdsH0dda+3wP5bhHGAPp/asx3eiwG5sevGNMzy4o2A6T4TP1oUob5hvnS81gwN+QneP3r1JD03mslN84XSuOE+Yk/2aqg/u+YoIY6OPdl77hDAwO1q5TLbVATNTMHE9JK6Sl7AI0fkZYNhrn7JJY47aRSSkVAljIiYTnUuDeq+BSiIpwwZ2d/53zGRHug8Yy6sNp2kuvcHLLMIvNjRKJmVMYFKi1+/H5FKDWapM8W9Y3+hyQF/IaXzQXPclOVz0i X-MS-Exchange-AntiSpam-MessageData-1: yuSEVlxIIB/N3p5tc1HZbqr1LXXLQpPxycY= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc292f8e-3764-49b7-9ec0-08ded2cf9bf4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2026 15:37:05.0994 (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: MLGij7JjYLUa7sSIohJZ6A8I0uahqP4joR6t3d7Tm3f/2XzqRV9DMbr++U04Ub5pAcDDd6OnpsmUQ5Su0ZOXTdHZnkZ6koU2Zd6Qeh8MJ5A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3891 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="iu0JB/a7"; 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:c202::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-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 | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc b/meta/recipes-core/isar-mmdebstrap/isar-mmdebstrap.inc index ab525216..376362bf 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}