From patchwork Mon Jun 15 09:24:46 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 5149 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 15 Jun 2026 11:25:31 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oa1-f60.google.com (mail-oa1-f60.google.com [209.85.160.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 65F9PTsC009045 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 15 Jun 2026 11:25:30 +0200 Received: by mail-oa1-f60.google.com with SMTP id 586e51a60fabf-43d1fa463d0sf2653956fac.0 for ; Mon, 15 Jun 2026 02:25:30 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1781515523; cv=pass; d=google.com; s=arc-20240605; b=HTXCsHOpF7Ez3E+Fr1289zJ3aN2kEaj0w8luvaUbOiDw4ycbPOqYOTuCbF9wjuTUaL hQfEzT5gSUkUmq52Wp7WCExvArQT3Lzt7hEtcSZPYXuczdCeq32mmqvQ7KuSB7ENuHcr WhvDqXHDTIpdoxUUZkmoyuiKiMUoFKUgwbwUP1o7fWW5PSEu+zkga7ptS+rLsZKaQiby uQXmaGJtH569G9HiTV3EqVRZI5rYf3dWK+mA1wk0ZJRoNmh0vKrF0mDTYQ+yj7bilsDI GDocY5l1GTPYc9hoMK1oxa56OEORbN9EjbQpSywgiSL7tblYOXFUNai0reQ2Q4foAxBs Ix3A== 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=nvqOO0sP2OuWxA8xjAck6AZT5IHn3NYGGFOcss7fQog=; fh=gD+re2aK4l2/5tCgZuVzd/+0jp+OiacyQ6qICcCBqgI=; b=D2F06vYWnRDBjSuh7tQgyNFc/w7BKd3765jvlvCWy5siJfy8p+kfe3rt7pc5a+Z8dH swrtKFOd+b9ONfaTDS1UJBRieG5nhOkpP9Qmi7frUfQYWEzUh3BvTbiYeDcGF1nR7/p9 VwrA2MGAEoNwc15jLlG+Nq4OKq82X/dMJ8CErAJJFFdKzVZ7WNnIBA0dAtvEqHcjJau7 I6zYL71rlQwdggT+br+oRSSWKfdwWwxKb6dQgTQ1jOTA33Iw0lGcY7TGeREtaTCoyYP9 8+dAWqmrkVeB6KovzvogjsTPoTkxvfwWwUSW19kw9se4MZqbM4Z3JvsqN6blQfw8skd+ bI/w==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=LFl0vcPl; 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:c200::1 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=1781515523; x=1782120323; 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=nvqOO0sP2OuWxA8xjAck6AZT5IHn3NYGGFOcss7fQog=; b=Gb1Z3SroRWYm4mZ2kh/B5szAsn+ydXOfE3M7F1elG/C7UUZ3QQ2D+CmEeJQA998YCA 9EEAp33/iHfnGm2xhB/h4tz7ek7q1RRO/8tiGOpAQ9QKIGP3Q0992dlS0gLMcBsG6oON clU92+8zBjt9H12pLW7zRMdqL+LDPLXIwcIwVDPkddi5T1koSDZNBfYpCM0Y9c7c7zX3 /a5F7MkGu+S5aYtO19MiEJr4qCca4pMiFijzOrT5Oy/LDG9npBPdzal8WTUz1ResWNxI CV9selMrWC4Ae73+dIYjElitVlhRfuahqZKB08UWITMVPW5fYBuHy0hDSvTWRI+1Tap3 q8Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781515523; x=1782120323; 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=nvqOO0sP2OuWxA8xjAck6AZT5IHn3NYGGFOcss7fQog=; b=IWi4oPACXPQqFZw11vDqt/SUqK+RIp+9BArzLnDijuciGIWvcQ7Ghf/7aTyC5vMU14 uU5blkNex6iYGds/qCu8avvIiCIr4nKRPQwQDUw38CP6cDHD/qSnyHNIQarym1s89CNE fkHMWtNDypBeJlwP5/TfCAEaScX4hp56kMKPtIv6qs9aV6hcnNqkuD5zAJ1UURBI92Dk d+fINb2dvVD6zN8cJFi3SrBWuUiTgr1dhoVJGU4fJ4MA8B09xgsFqKXIq/dlDuW4u0M4 D8romANWnHrOxLZoijUczDsgYOx4ryWlUCZW2aFW1nGtxObRqxiIkEUDL9aKRTg/u/yL tspQ== X-Forwarded-Encrypted: i=3; AFNElJ/6SwT7XSTeutV5qEueizw1iuO9caTkktLTPW1o85wdplQvcq2aNkWYjNxVyT7RbO4lV4iOoaM=@isar-build.org X-Gm-Message-State: AOJu0YyWTrI2uhM5IOTWJvMv1++fGUOZfs4WsIs5niEvJZoyIWah6J3h tAQGPRmxrlwcZPzKpFzRN39heBGzY4nBAhupV3TLIBx3ipceMLD5rzo0 X-Received: by 2002:a05:6871:5224:b0:441:b0ff:132a with SMTP id 586e51a60fabf-4428c49a898mr6247970fac.18.1781515522966; Mon, 15 Jun 2026 02:25:22 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AX0PUUdQy3j+ANY+DLJvDxrw5/us0Jv7fL7EyNSDDXloqO4Ccw==" Received: by 2002:a05:6870:1689:b0:41c:583a:b50 with SMTP id 586e51a60fabf-442623b3262ls1195310fac.1.-pod-prod-04-us; Mon, 15 Jun 2026 02:25:22 -0700 (PDT) X-Received: by 2002:a05:6808:1455:b0:487:61df:b6b0 with SMTP id 5614622812f47-48761dfe478mr3305639b6e.31.1781515521931; Mon, 15 Jun 2026 02:25:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1781515521; cv=pass; d=google.com; s=arc-20240605; b=Zj5nA0HefdfsqKJ3moL9E0iBID5big4XfxbPfP6lrdzRoehSyslnyBiQKy7tUltVYB NkY9Ugw3Ej/bGztVAJEWwQT8kFiKb96DjOHXAmcGG4qs3xRdvLBfaK4gNMEgQp6Ujz1F Rt8ANYNBSa7lyB2sprgur0P1p/HlUajZ/zOjyOlTrcS7dYwcrsrP0xEUt+OHyP8LpZ15 PsHSqYTE/unD/txMB3tZu5EwaCjC5Q80C+35O8Z8VkV4nu7UsoQOjlbwRpGgRe22YWrP /3IKJPIOJ2NVMQx4CpE2ppVFvNBC87ScQYNaXgqlgSG1qrFUavYLK+CIgPYlvvRHxG9y 4n4Q== 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=wp2xaxsd4WrGtm0TxvQ0dsIIgS0pU6nhkxVgbsdZKII=; fh=WkhL8kaJc+l2wQon1t06Ej3uvBGj9sVhNcE8PaS/XbI=; b=D0vQe18oteVp2oEhTO+Y4o4cGj2FqBikP4FPdnSO6fK9v8Z2Ki+bwsoRwOM93LIJ44 137JK7TDJfIlv1qFfIPKP7yfJZkmIkb7GXCXIYd5hl9MLBpMzlLh4Ak4YbXuremu9dTG Buwx/a1ht5LwdtJed2UEUE90onfoSrUqgWbyZPvHsayM+wnikTOu0iVjTei2fv70V/QM SpbLV6TcBAFrZJKoFgFmnSrxyYIb3m7+aHrSmEaAeZaOF7iS1FT+zgPJfb+VsZV/w0aq W1sI0dNehRWvU0A/nM+k8GmsO6sBOpTI6tVzEoUw5vZp3aEGf6xeuQtQ+NFQwlgNPFnZ Y/tQ==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=LFl0vcPl; 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:c200::1 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazlp170100001.outbound.protection.outlook.com. [2a01:111:f403:c200::1]) by gmr-mx.google.com with ESMTPS id 5614622812f47-4875ddb2f0esi130611b6e.2.2026.06.15.02.25.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2026 02:25:21 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c200::1 as permitted sender) client-ip=2a01:111:f403:c200::1; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=b4qEIfRNqn/FLh4vzky7sHDhVD99XVAi3eYONQ60dgd5HkfKOShEmn+8j8QinXq34O5/chkBNTr/EuKwq055dbIchk0Nl9AJ12C90o38e0o1IESnA8tybV8If5cAGA0tQz1eTunoVDuG1tSNGLphsbhNH3eQcJchJ8ras8oMmuetWWrAYbevR3bdaHmpV6hLVpQ2h7XC+UaYo8vloHT4vloSuF7zUxzNtLRxiAQL8lvgHkdPZdosLHhLbMdkuBNv1/qYKe1eOY3GEIIWuSwlTJrHqhAj5az+IMyJ7UWR5VPCewyo2M9SMLdmoYKjHFalDYkcL+HFndCzM4i/dxZswQ== 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=wp2xaxsd4WrGtm0TxvQ0dsIIgS0pU6nhkxVgbsdZKII=; b=ckNL+wakCwIsqh6nYvWpzLeTorQxi4bTlzvj41gSvWm5w2lHCrhl1e85Epr0/yVGGbTeAsWQBlbDE4E4i1aG+ePweJbgfd8uaV8gaCFQTB7Pdf5vYJpkW/DYlJr16ulsMluV/BRdFMBoprhTn8UJBtYWD9NhJ7E5XejeUE1Y0NMYbWJ0uHfnNgxVBUaQm2nUgiUQYjksK7VMBSlcDDRuCr9hKX9orr5/jJABEQwCf+Yhs20v+Z7UTdiFDMLmwa6/NctkVl8JXsrCQIrjBXVflxWQvVYoucooMJvABKE0ACYsamRw5IgJMKm+a5DYcBRct0zsK+pZTSunrB4OBBZM7w== 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 AS2PR10MB7023.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:599::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.113.18; Mon, 15 Jun 2026 09:25:18 +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.0113.015; Mon, 15 Jun 2026 09:25: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 v6 05/17] bootstrap: move cleanup trap to function Date: Mon, 15 Jun 2026 11:24:46 +0200 Message-ID: <20260615092458.259691-6-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260615092458.259691-1-felix.moessbauer@siemens.com> References: <20260615092458.259691-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: FR4P281CA0109.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:bb::13) To AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:17e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM7PR10MB3956:EE_|AS2PR10MB7023:EE_ X-MS-Office365-Filtering-Correlation-Id: f41f5163-c126-45e8-8bf4-08decac00424 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|23010399003|10070799003|55112099003|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: d0aYQ3Gx36QVR6ZD095d54WR4Fi/QZO0vO9Weq8v8jhlFO0YRqp+7g6Ton8hZ9snZDJxtwqzQteLFqM7d/7Tblijpeq6o8l151heLo9V60S+B1RuvYgGovbJ1VehX45PiNODLGZrr8lOO2mQXdZ2///1JtpxnXDxdO0kyIiMGlB9EF5WNXc7pvj8ES84Oa3Ms5Q0llK2U0ZeaW/yTi0o9ReN9HQbHv9W3DB6EHvD0oytyik7HqUb3Mz6a/pvAkJK/vmbCdFlqLOcViVkMsCykdS7h3HB8nrHxR2a/AZS2jiVrNJOCdD0UNGglPvYInXRbCNQnf2z8Y3xy0ls3sNEKp/cfjMfVyXokl0ZUiIMDnYmBqVnB1ihsgzMlgIW8BmsEweg1rGYivvuWPcBmR/CTp8WSBfRM2X+c3eIGTQ7WzrOQjd1K81v5+u6ScHkLDZWx2vPYpZPBw4mhzfaZFc/pT20JeXwF7nq3YKYFKavlgxds3up1pfDYXjOC3ziXXD7N3aAI0un7nto6Zw3h8vlXG9XnC4q6JfOsvt1wvYglPqtvy7cyGSpdoM7QTELIx2O1Zrojbvx+L1FWHv/YBzZSWKEob+AUMlZ2DGCnmVIyMMy5XjIWbLtJIERQN7lrUl/uVWqs29Oa6OXGvdrZ3tbelAKhkcIVQOISPA7SyP/eQyDS1KFbJDrpoQJwVhuz6Vj 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)(376014)(1800799024)(23010399003)(10070799003)(55112099003)(56012099006)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: XW61IOzFRI/pqjYpK/OIAYOMLyJ+ET8+a7FyORYsjnMq2QBIYX8rPR6Fd6aRTJQmIQTjLVrghJvL0XoCOfC5CjcQHsIFVw6ALQ7KB8j1LE9VG4DiCanlQHh4iC8mtHlep+NcvJjXrwXjs2Dj78wuYYwEj/OKCjIxjmBhz+R+/KgLWum3OjO9Eutb+trkI/LHJMTBw23zOTKSYgoZIhGrxN9Ii9Pgd/Ujlj3X1B/BSt2kHS6pRqa0inQdFV3DxA2x26QOzfdNOTArJU3esL4MLv5Zr0aiqyxBsvdL3jaDqdYS5HDM9mah1+To2pu9BliXbYHXY+iQbL53sFngO5sObL2S24bcJC4K/Xw6GlMWn452qxP1gjkEUQVa0YMH5lC5bgZg4DfaikvQ5mE4gQy97T4p42rIMhwA0zn5XbYj4pIvB4E1bYoNdZQMyfq/M/tagWMs+NLhQ6BpPcvMIumKu94tF+u+hk2F6XwDZcVJLJwXdrcUVCGNqVYMk4b9QMlIoX7c8KRMOpBWKa2NSdNW0WEVniUhI/MLLOaOF63kk8LXeRhRaX1YN87M4ELHcKdRtWO9G97taqA8wyDHzocFuHohMcKi4WcQawQ1IRFHRGrK93AfcT6P3LEpmKH43qpsVl5DnRHnjl7DStjxUV6EMm5MayAt4bvOi1kxfmuNzG6Ok576RQIPFoVqsBDaV3si+AAWEm50CIrL7FJMn9WEOyAk/sYglJu9Nq9ycMGizE6fsxjh7elMra2K7PARpffC0zEtK+/DrN4oEqhSWJ2VftowuddI1eEwWWi8mnTbgB213ukRRe1DgT63HSLDXR2vB4OuRPgwzKj1hi/gjZJ+0I2nctJEAHthzpgUkF8Cmu6hWt7m29TQVguF+tZ7PL0ywWk1kzUjpBzdnauAV+QchWa3VRvBM+3zeVPx2XMUy2OJLuQFYstGpUj4bgYh0kwGfPCKDtD7jIF4fnEa4VZIyIaJ3Ol7w3+5GQbGZqotBQBgEYRwGTXw1nO3VQGGO+nIc7FLWjHWUsLQIDXtJ2aquuHjEXQwDPAZh56XoZpv1CWxzw51SLLEUKXbogZLv5rolLC6kcBh8oLjmOuJxtDIaxKhaccS2mrRfpkorZBMoHiy+GkG5ciErqC7+7l9ov0Pt5pktjJfSQjuTUcOdk0SWrDJ23kdjRbn5fpz9mDxjOsrl5xWzbCV5lryjDLXSvNbYUWhMFx/Ry/mRVIw/NY1zn8+HHdiQsgLjaK3eoVgQevKrcTcJmmxveV4ZFMiozHy01V2gEGnkWlhNIaJYwshVJF/O0rw3tZeRlUs2GjZkbEixW/FFlrREcuJlpuJ1YBqGmZlIa+1ISviq1DWRM+0EUZl+gqLO9wbAiU6+fB+4Phcw/4mx0pKyzcXRotRfYGF1nTdeYan7PXEvJEV+ODATHYjZxrTWjTHlpoPQVJSBhYwHgon3WVvUfTAkrnNcxcvJib0yPNCnP6t9R5TTbvsTfhO/RNkpdOneTrmZudjjQ4Xfe4OJtqpRxNBtfuD4khkPy0UX51eVTxYuICUZLSs+RQi4ubOR6AF0YIZUcB9hwe9aegsdBEXxgvMm0pWwYyoKkSOcJYMF0/XMzcqQIHUL5AulwZ6A3hbX2GZl2Odm/fLO1vMET78PPuwlvk5OYtY2o0wtL5nLTzW+GpjL+pl8mYkbk6cgURrPV8EaCwQ3Aphg94L5eS2uRqWnVzzhNOfM/IzPq2VLX0l66FX3g7dD/uGg01amYkkJrXYgiFYwFIhu4ChPRytsCNHflvqCjvD47ClnvT9 X-MS-Exchange-AntiSpam-MessageData-1: eZKHYs7DTBKZ6zuGxL0T6StljsoNd4oK/8I= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: f41f5163-c126-45e8-8bf4-08decac00424 X-MS-Exchange-CrossTenant-AuthSource: AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2026 09:25:18.6301 (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: zTnIQdHOvxW7YlTXYsgqpaY3+iNlxHZMxokamzXcnV/jQD86ROz3b2nMlscj8oW88yJLqfNppYAOilq6lf4dtdBvMcr+dYNb+KUL41x+NAk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR10MB7023 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=LFl0vcPl; 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:c200::1 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 | 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 596a6152..eba6ea85 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}