From patchwork Thu Feb 26 16:28:30 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 4914 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 26 Feb 2026 17:29:08 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f60.google.com (mail-qv1-f60.google.com [209.85.219.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 61QGT6LN009344 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 26 Feb 2026 17:29:07 +0100 Received: by mail-qv1-f60.google.com with SMTP id 6a1803df08f44-899afef8eebsf167019596d6.3 for ; Thu, 26 Feb 2026 08:29:07 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1772123341; cv=pass; d=google.com; s=arc-20240605; b=Fuz9ek6iSFmPYR5Zkpuq8dUpFWRGcEcWgILFlVOM3kxAWDQ2yLLaoZKf182ePh5MI7 HrJxoNv/MDsq/tD/8au/Ns5CRM/V51HMwes/iE5KlJODaIA379JVfQu9vRm7wji4A7UU XFveTecuzFOrZGoFqpZr6G6yzZ2uJjZ/nCaNMAMubP7J0WQ7pw33ErYQrCoLuwZGiNR9 nnry8Zlelr23Gsy+3by6fagszj8AQCWq7RYVf5mF/OWJ8joxjZeWQAIYPYwpFvH6kJAw tYGBe7mHEG6+m9ozwQ1s3M4znPQvgNoZWZBqQa2wv3k4p9vkTfjwovHHoH+PAd3MedEa qKPA== 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=tzQKNRqUqx7dTlFcUxA299XNwz7YH81kj2ADYytSQBc=; fh=2bGtxC67TgNnS1pPQYTqQJF3GbWeNQAV+yq1Cd1Mt+o=; b=RT0gSv8lf2Y/nEL47pY3CDZoroUepONZSiKSBblCE8ZMXk3uVVfKhnbTDQWRdW/QrX 72kqUSR+bcBC24uxBhvzZkIMtM2JF93hxmrbo6fvdUWk1awkb1mV41CUAdRoSVaDMt4y qo4JweJtb30M/l0XemP4zwIZ7UUZy7X2/X9hTiVmd2d0O4iDg8pqCzItpqHbeUpBNNDt XOGiKcn20ueYvqORoznJmpZXwQyrX52qOtwk8KP/RNtkR1UxZVzQ2IPPYqJHzcdjQ3gC vPlXMx4BfryF7g1Nv+klnv49E+VRT1SON4s2lsJTfUD9qM5ohW4/XEHaGtOeV70qlbI/ equg==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=sxPV8R3P; 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=1772123341; x=1772728141; 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=tzQKNRqUqx7dTlFcUxA299XNwz7YH81kj2ADYytSQBc=; b=knTgBwO93GI1BOVwehunyjvTFS4HYTcwJBlr8HFXEt9aL8V0kTHl7ACzFVLxiHCbDM hfvhgpyODMPkDIJpcj6siUsBWb9/IQUGEGKnTB57KgKPFh2anOkGxmeyg7qXgldyX7jw gMmloYWUA18fYRmBGkzx6EhOCraBA/zYeb7YpEjGofrGRrPIDRWj68ZfYK9HMKLsnewT tJtB9N8PXrgVCK8dAZx/eRaPynH1BMuLh+8nhKlWw9ALuHexMwHrwqtQWbMr99Tx5bEg vh80u7T2mbBQ78GTYCLvSXDnYZQz3JqXYqrqcYM/ZOQ8guhvcD5vwLvO7bmBIM5kM6Tj p4pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772123341; x=1772728141; 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=tzQKNRqUqx7dTlFcUxA299XNwz7YH81kj2ADYytSQBc=; b=dMGpQM5o+Q0jGyd1psQadxmNhfivJWOGdQDkExW1pU69/MRkOu/g3uQoyBt5UAxP7Z lOT7FmJ9KiNNcHt9QcYvlJz/HElM/i6GnLjC/0oFOo7HqkdGlhQm1m+dE/7XVCm4dpO9 P7NrjVXE7MdmOoVmsZq2IY4y9OO9WGyCAYClRQCoJFdMat+f948PNF20F6zk2rNi15qa 5hByaIMokXJc9mP/OKi4hxQZDdsZBY43xsmy/EARgRO1VC6m7HQOzin1dqs+mhCpBrbm bUVCpMHHKYZnXY3VChH49u2SHj1zSQe+jSK7AVWJfqXNSKwObCFCLuinaxRs0Bl/sXE4 A76w== X-Forwarded-Encrypted: i=3; AJvYcCUKRwlPCzq9jG50sAoCoywbEp9Mf0U/tSJHbTH/Ek4K4HIL3q2BUwKQM7u3OVEj5iGFYf6pi44=@isar-build.org X-Gm-Message-State: AOJu0Yxo80J6+MdSFVuVJaSdMpO1yFsqMKQ58rfaj8LhkgmaM2OemZMR /WtLyv4aaSSBJonVuAQKRUzVEyXijXeF86raTh68yXGMGwd84jh2118J X-Received: by 2002:a05:6214:27cc:b0:894:61c8:930d with SMTP id 6a1803df08f44-899c13fe982mr72509066d6.21.1772123341232; Thu, 26 Feb 2026 08:29:01 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+FMgZOOMlHHTTKAUYolPDpyKR1WepFe3Pai5fqzg4Xu5Q==" Received: by 2002:a05:6214:27e1:b0:88f:cb33:421b with SMTP id 6a1803df08f44-899ba100d2dls12183966d6.2.-pod-prod-06-us; Thu, 26 Feb 2026 08:29:00 -0800 (PST) X-Received: by 2002:a05:6214:29e5:b0:894:6d0b:502 with SMTP id 6a1803df08f44-899c1f09296mr72238886d6.59.1772123340290; Thu, 26 Feb 2026 08:29:00 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1772123340; cv=pass; d=google.com; s=arc-20240605; b=lhL+xj8z4XHE+bECQgHkiUS2lwwPotlG3nA49XQr2nRw2VeVfG0HcVGfDtsevy5IKl brwpEiQVo5U7KvnTexn/j36bPhnIIpghc/tsGCL2n39RxiOrph56cRMUT4uLhuthYE3a KYlkgsbcnoB5X7O7K3ayMrQXEaF8TW8ayYPqCj/sv1YBKCQNOLexD1B4JFiVw16vwv+r C+fK4cQSQsbIMW9JLYa6H0NjL8jwJBwbmjX7tffr46jkYc+SZ7OASm4nBqZLHKO22c/D HfNTYWErOk+3v3dOiIx8+oRl+b21T6FDVrOdKUFRhPc52Iy4LTryzVjCE3YxfgErYYlB 7qmQ== 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=MzaVReVuosZTaWhRLS/p5mLxd5t2bEBTVdeUt9ibTVKk1AuNwkUBeVlg2/2y1S9u3f Z6gOPQzDWW5id2KBZcq8Mi8wHdI8HO8mZ1h3akxTyV/NuEiSftGc2Qn4AM2SS91l/Q6K l5F2sHYSDQGK1rCQ0x1oJJ+rp+LBA1wv2bf4jBDpicKN5DB+/TeIfYksoyezLEqUElat Cd1yXxDbMmanxQFsM1MmqdKFzG511VjEOHEPHTU49lET324OtBkXjF1XVEsR1QVLbzJa ZcYxlIkXTjccEKcdJznbyGQo8H2at7k0Nq5+/vEIJW4raAH19n0vE+s9vZxjpfwmISsn 9jGw==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=sxPV8R3P; 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 6a1803df08f44-899c7341843si723156d6.7.2026.02.26.08.29.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 08:29:00 -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=ygCygF1yDs8Qtb7c5H88mrWzyKBEyHc8Cr3onpb0xtIFD4ZUWRo6XXZ1bJtBfvcoMo+jtYsjToZi7mpBg+hdKErM1ivWMwImN7eI32BjDKgTcDWPy8TkRqPpaeSKxeE2XB24SjIMGp/OePKr7OlWDApLWkgXscO++QvktjWMeOR6nqlsynXIKVpjJAVzlt6dSTkb1Y3M6mrj+qcmIeQTZPsboSgaZOABxckEj29n1QyYVERVLPdfqoHMzr26YkRIXqoTvvhA7cD92MyPuxct4BvfMf5KQTpCqt7Vw1bnB/tCktkyWtVkkbdMDSTbzTo2DnhmrSa4rO80T4ac4cqRdA== 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=nvWJGMEohsf638soR6cfP2tSVmSgtW6pd1730RXxe3eTmu6F+hRd5/fuX4uqsBYY8osjW74Qu+/0czIMfBtvBFSs/NXvtJzpor5OXQkXrGg2hzm2/EOFvZ5hSjDAZJllRyg5xcTh282wFB8T/VGEMP7OfqXerHG2N8lE/6iRHXKOuXkF84RQFfFU94YuPJ+DmhVNJ2eGzFRrwA5Oagq1LCnOqGdyQatXLttRhFZ+Ijc8vuJtJ2jhK3bisIYZkrS/xHSbuKs/55j/mww8TvwcATK59pJe+iQNXiqCEh+DiWwkbptDaFqoG9pRnPUC0ab8tNj9DDeu7g31jEcS0O1qTg== 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 DU0PR10MB9297.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:59a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9632.23; Thu, 26 Feb 2026 16:28:58 +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; Thu, 26 Feb 2026 16:28:57 +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 v1 05/15] bootstrap: move cleanup trap to function Date: Thu, 26 Feb 2026 17:28:30 +0100 Message-ID: <20260226162843.1642329-6-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260226162843.1642329-1-felix.moessbauer@siemens.com> References: <20260226162843.1642329-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: FR4P281CA0218.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:e4::12) To DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:47f::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR10MB6828:EE_|DU0PR10MB9297:EE_ X-MS-Office365-Filtering-Correlation-Id: 634f553e-2f84-47dd-0fa1-08de755423fb X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: 05yxKF9n/aHZKWxx4TzTLP1fsgjhPGNE3cD4qtufwOe/Af4NYzk5tyrFaF2I2vdQrjC+EeGwl2oq991kfJcX7x8JwoEMMrAXStuXL2TJBmS8HUKJFY18RxVCV7z0v80rI8dn4bJ+V4hPsVTSxipHk5bE8lxuVMOp3NYMUQsmj2W97OiasLM7C20y12fEKuqDwzdgdCvJU688Cbf5EzeeMxXJOJ3+p9iYfBv11AUeucjuT3Id3ArxBDOLgpzhmTsuK07mHB4ltUHNYVVWZXLKxnelwOc0dYsUbwqz0KXDO5bElOHTrjh3vf4AigDJs11tUVOWVCIByrMHqsuQS0BCIaP5TfkIrmCPVsBeEsVj58CNwzzZYK0gfMAtgXsZGpkJzrDPsHMlgNw7kiWbCzVlQAhf+Xxma7iAthTQ2P5iw0FzI6XNqSbAUxNAqoOk7LNbdfxQD6NPO/dRpL0CRUtPnzxLtSW01NlAaa2Y35eadfcct1HqYpblbSaIxF+soWZUSJhuw6adYfzP+kq49gCffyMtW/RA6O+Y+D6rPFZdzB8rGrkFcyjqw2nfLdNcYoClfHnrioJ6v/wSVcv+zF3+vZue3nfqzbLPmbPf0lo6XLZlXACXESUIsgca3BWkpEl+rcFxr7CHQYusnunJmgL6CJC0O0hGl+h15Mqrfa8EkIk4tW38n6RDj4oUEM+vLZl/3O7KtivD1nvciHzH9B+Fhu0pECiBsXj2/WB4NQ8BIvI= 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)(10070799003)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: Yv+FbeT9lxpxesW1u0xYYIxh04+uQl87MNhU0Rb6yUudWsHA1ZprnEO1UXfrS6UntbLZeYEHIb3fAeftZIHIt03kPq4wD9IA2bhjCDPMQGJ+7SenYChuGuYZsng76zVjydH046wdNt44feDuzxeihEFauxPlovwny7YWXjDQdeeSS7Q1rMEY/QOgmdq5NnvvlyQZTtUbQzvUn9ZLP53taqWeXppQ2aVs7yEvMQM6vlvn/JWg1zqVjI296WXj5RHYKQ2E/q9fVbzM3URXccNVJspbV4q5AUAQ9m4wVSNBFodwmYyKz5DZqnNR24xIDNOEQTX/NH83gbWqrjrugwro4rK1BEPY7sCwi0ba48uGgMTbun1ra8SuASpbYiZIkIIaETqe5kr7/vXx0xxnhSTBdrwyhKCCHv5eV7EE8QqOHQPiVe0L3OyKzuz5yHn12OCMkYbRspNp4NK59oOR59feP/wdA1NMxIvo+g/GHYaWusy+iUSCl+aeDxzH1jsDYsmy+fKzABYoJKSWhBbZgyIuXXW4ZICwD96vhBR/cSvNHhcYdapKImx2oRVYDBFU7iNNPfU6qtcbpCS4G/XKO95kxzXxj+2WdhMLj7COd+1u0IIIC8ttP4wgXpa79NR8FlykY44oJWfwT4+glB+OaC/IdTlWZrCaEmcqQMSrUcglXwLGfEJEa9wjVTjECrdfS6WJgsCdvN5OVOLViA8K2Q/gl4ar92xlWpWLubTZg6m8UY8vlKwdXZ9IsaV6hp0gPVzL5WeoBuMdQBFM4r8gsezz/5jjEGasiyOSOG8lvfwlmArB4dY8SWNsXiZrdts4/A2iNmjtqeN94OSq56MfKeZU1nLKEnKgnf6LxoaQz1MFH/PubnHffm9S3/8mrZZ41VA/sp84BBfGJXgpKnDzy7T5A1NR5I0Gbsti8JqpcpmpQrzsRiM2Vx3upFBnZhzf6vt4vewzPphKrXT0rj3roeZpLqdsHvR0FR6yZdk0zh64MMhva2uhV0kuK82mdO5SH+PcgLbU6/dzdtGQ/utleYq+RpwReyUVoHGnI5HR1CwVmwCyXEHtbbmLLq/p45sQK3eZbBo8kQy4PectQuRXW+3eAZCdbl2btQC5CDGn/Wxn2avKCCFjMYCGXUnUN/Rv2vlivVo56/A4HlQDaAydoPBYTpB+Puxvt8R4RfiqXvmN5WgfXQItOCqDyd9xP5vzMp8UJLzZ8Eud9p/QnVn/sTjFC5vpMh7UFz9onZuSRPUXcwPH63Xesu2d0n8cBHJxalaTPDuT+9i6PCuAB0bbBbEmztlP58t9TyuHF1MJvyCTwLGCBw/78WY10cUM5VsgK2hk4scgEoE6dpLPsOiusWFvhPPSfMP2VggVDuff7RFh3gusB1XKKtdbNjTbBo0ns3sbkr5qPpGlZi1jAXWrDUg4FppGd0lZIdpEuiHvMNt65ggEVYgb76ItVgE7pq3yN+mcEtBJrnD9izRXJ3yIU4mFd4nogg7MX2MJwvv6/mL21WF0kwf14CfFW7jBdqmtX99TJKZJR5lW7fUxOGdDf6RVetvRMITwDhXJ8vyZraMwLbq0tKd+bECFdDA7DkVh62GX2CN6ZTj6NsX303fEdiprSDmla2Crgm+XGp152cSj9qn0XfotokzVScoTMzcu8x0STgVE/p0Z26RIbpPC1aRh8tJrXIMViQhl1gqyETFsz4VgXNy/+DjlrbHBDbrGPdTMy5zYzVwwvxelkQJFI5p4V+zkjyp2d8J/nroBc6YXHgmP5BcwLolJgGn+kMLoOqtVU9n8tjNL X-MS-Exchange-AntiSpam-MessageData-1: p4g8JnHyqlTanIertYsKQDPkAZGjWSkZm2s= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 634f553e-2f84-47dd-0fa1-08de755423fb X-MS-Exchange-CrossTenant-AuthSource: DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2026 16:28:57.8880 (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: 4FOk6CQ3b5lrXlAosSQkH8+g+gdG9fXTKXbfsLD43GlDsERYLRJqrfd3FzgfOwTtW7z5mFSIdxOfLdh0eQLmW2OQCoILbKCsVTY2jePIzL0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR10MB9297 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=sxPV8R3P; 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-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}