From patchwork Tue Apr 7 14:22:59 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 5012 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 07 Apr 2026 16:23:33 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f55.google.com (mail-pj1-f55.google.com [209.85.216.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 637ENWsF015006 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 7 Apr 2026 16:23:33 +0200 Received: by mail-pj1-f55.google.com with SMTP id 98e67ed59e1d1-35d90c7ec5asf12584735a91.2 for ; Tue, 07 Apr 2026 07:23:32 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1775571806; cv=pass; d=google.com; s=arc-20240605; b=XxYhTwBUYiv3OAcey2yJXuoAcAeH3siAfTcNUeEt8JejK5/YQDXu3CwXwHcGgAyW/c Ejbra0KhGkGRRFY3LfGOv+goSwPxy+YMicljNcCLI5y3ka/iTT0UIV13Ax7yUTluO2b1 AyI4nXY1S884OR5BCHvrgf5pZ13A0WeyceVlmgaP4fF0HltehFbT6wKVTwCbSPnYAjwi 8g66gInTdQBxA38MHjVkk2vdGLerF7VXZRpIznm6TxLjlsd/VDvrcY6Zn36n+jljtf3f G6eavDzrA+VjaHOv9Z6vNv+vCrNJQ6KS1N4Ve0Ni2MpLmorpjlsiaf1yfGVDQmqNaLPm Of8g== 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=EuRk9CoD/a4T78HN9dK9o8IMbT+dZDQdUPFYkdbJWzg=; fh=vGhs1by/Kg9xbTZoAYISIcp+lGa/1ZtFqZuSCeqnkyI=; b=AcdORCcpDRCaZ6Xd4KDOc/GyAqJo9AvfbcM71oUfe0NrvvAZsZTA+EQkbRC0xm2+RP onVBSwLQSiYw1i5phQHUmPsbj138DQ7koVrT1R6/CKCpAqpv8ZtpZuojyDMyVZJEofuN YN11U9r2Po6L3WKOMRAEVEZo+4bjzoZDUTy7Yx9EjB90PT8DmeE1gGACPpESUL94rqKF jkKKj39jDuBZ7lgb5YduIy2nXo8dntzIle7PquEa0cuFHYB1+NiZTwurBcTHVwp9rK1j qjQOe/0z3ce9sXm9r9B4Fm+fb+QCpznBi5CYuI2wYL/jCFkzX26jKPQzKj64MBynw9c7 lREA==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=AHE0HSb6; 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::3 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=1775571806; x=1776176606; 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=EuRk9CoD/a4T78HN9dK9o8IMbT+dZDQdUPFYkdbJWzg=; b=wTQhY9+JaJNh/MeQ+CQ6V/FQA/ziL9M7AqCyYIjnB3aTGgC4kWKsZGUcQz32jebazK +fxXW4Lp5n/HlAFrVT6bzup3FW2GflojoB6ySWWc2BKExbM6gOXZIdIF9OHLRKAmPpRz u/MbLhTtMqJ1KPRxb+Xz2+frZvu0eNaGhHGLARTzxXOH8uceSimFLnQLY0xhJegaKyJy wZTnEKW1UimLoIAm3bCfTd0JvlmIpS5PMdGCIXiCoU+4Hw5Jd21UoVUoSU7IunneICxE PmartOefEZeyGMamRsq5hFw/mtKB8NYb+GjivrBsa0pQ8vLmnUZbwBV2KLupWS2O9G9e ccBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775571806; x=1776176606; 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=EuRk9CoD/a4T78HN9dK9o8IMbT+dZDQdUPFYkdbJWzg=; b=KojNUgwbRZTkb5ugZ9x2iDYyogxVkm+5bK4XrnEGpdyTJO3ANBPLDF+pnR/dbJYI/X Lw7MvmH0sw/1XhDmhHHj7Y21+KkwHYiKavqZH8LlMOcxnzMZYx6QttaFzZA/fH4+UHEv hMAMxcOO/0iqRUNX+RYNAWJxHr1w1X5kbTzfxBkidQYy9Wmdt0CjrTrNvArHjssIYM/+ NasB+TRXzbrMO3OA0X3Fn+e1TW9F41WJh8V3/om4EUrMCxfxeKTqOJg+Rv800fxrVy1q kaT9NzNBbNzKOINC5kyeAO8Af/U9VfReAKBTHaJ/Wqi3V0vAwDplhkpwzVW0sid3J+9A OJCA== X-Forwarded-Encrypted: i=3; AJvYcCVFpPvTR2XXukXFF/uQbT8ECBPIEzkYXaDU/H3UBcmGfVhVjumebzHglLN1PEfSJPBq1+2UouI=@isar-build.org X-Gm-Message-State: AOJu0Yy2emIJ/4pMZcm9Oey6Ga8xEWbHnKqfy5E5xXTUo9FNyaR6qOtw rw+ejAdiVHFG7iOFqE+kXvFQ6mk4eJvUcOn0t2+zB9FEkN/yfsm7BsRq X-Received: by 2002:a17:90b:1dcc:b0:35c:30a8:330 with SMTP id 98e67ed59e1d1-35de66262d8mr17238752a91.0.1775571806548; Tue, 07 Apr 2026 07:23:26 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AYAyTiL0keOruxwBGXzrrJ5gZFgz4asNmwmx2l1f+pIglipTZQ==" Received: by 2002:a17:90a:d50d:b0:359:bc4f:ffbb with SMTP id 98e67ed59e1d1-35dd406bd6cls5338243a91.0.-pod-prod-06-us; Tue, 07 Apr 2026 07:23:25 -0700 (PDT) X-Received: by 2002:a05:6a20:e291:b0:39f:5839:af09 with SMTP id adf61e73a8af0-39f5839cf5dmr12860449637.10.1775571805259; Tue, 07 Apr 2026 07:23:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1775571805; cv=pass; d=google.com; s=arc-20240605; b=FpEt99HHFznZRrEZcIqCwDRO653vIHzw29el+UGXEak073MPEbJgpytsWv5koetSvT H12u9iOagsdC7DsoVYkZo/ig2XPg5w2CFdCoyboKJX65SZCCNdL6nxCQftNsce+9TH+Z SbZbZxlelb1yTknpHa9de/P612XrOzVkUovcAtbxqvZDB9TAo1b6uHOqvFbMRvj0IcGa R4d38AWD+1jYiv2UW+PU/niUe8RMKwRSzaAAZ6xOsNnKd33EQg2P6ZX32jad0mOdvHVU bDdgRhtCrNIHgkIQBIZsW4arf070rq5MFko89i1irwKhFEPSVvdq6sfRVb6FQrr6BTVe cB+A== 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=QNrPsp+aaXDH1RCI25KS6avJmr0/IOSi3ZRzWuW3bEdm1b2jL4V0nQ8jlKXenBNgDT QIU0SyyLjZsXx4EAZZXcIHFzJeEp+NJIy9ql9e+jpMpk5LKqoXn0sPqV7czNhdWi7y6I Qg7hJBnBPaUlaGbm1BwbMWNjmgaU2n+bD70Llch6/nXeBugEfMaPk9+LlSPSyMQtjqol phKuekHq0ZlSluiYX1Zi8Tunefax2a+quVWMRHeUj2UzWw+v4MKhTyY46rKP7Nf39mhS ti0lhXw43XP/7NH1jkwVvyjWJQdt5Dg5cG0KLDTSqsgliA/vzTK9JEXeZ9AEGIlXxmxx IeAA==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=AHE0HSb6; 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::3 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazlp170110003.outbound.protection.outlook.com. [2a01:111:f403:c200::3]) by gmr-mx.google.com with ESMTPS id d2e1a72fcca58-82cf9b37161si563917b3a.2.2026.04.07.07.23.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 07:23:25 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c200::3 as permitted sender) client-ip=2a01:111:f403:c200::3; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QSBEP/k/ytUYjwh7M44obpulNuZBXRQKrf4XuZfoBVysTZ4cM2GFv7NRx/kbzn58bFYpK1JENvBFyNHfeNfylSaX77dqYT5ftX+KsSu8DxC3xoafGIT4lS7cWKW+hPdDYtIUG8M33dE+40iKAiOT2dFcbTBhrmlQjK1k1OsQ8tOEqHjuREWsomc0YyghAsHdVzUlSdc604OpYPuR+pBSUVGB0qBiYuXYDp772FiNUHXDVKPUP67BHH3oBfWjqvaxJsOycdB2hb7dwXI3hsXqHKTC1KsL6ihdkt4MMujvyJQodLV0vftDAOHYPfdQQWdWWyr4j1SfpuLleOUwEnw8tw== 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=RW3Vz0ftQAfdQl0/kiTvKQoFgOVpPv+b6uVnJgy8Oa2fv0t7qW4QKq7vz9iAv6MzsYcHDmLyr8Z2Zxp+7tqWc4vQ9Km2/Gubc2ZzIoiZClqqfLXE54bhGa64b0o9xiucxSJ7bEu47sM6xUnhy14AZqGNsDo2a9TCy4WdR/Y2yrzXSfivoAgK4B7sVdozWm+GBiy8ogdBYK/bzGqQph6AzfYs+Ls/whiq5Sy+IG2/QD3pKL9As1CKn1mp4ypWDrvtdS4m62RkwLGL0R1aaVdml2vbRAUssBNUZMwNUKjKvC9LZ4nG6CBOTVpjNQIKiIhprTcKh8kNew/CEhvaQpRCbA== 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 AS2PR10MB6376.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:557::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.17; Tue, 7 Apr 2026 14:23:22 +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.9745.030; Tue, 7 Apr 2026 14:23:22 +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 v3 05/16] bootstrap: move cleanup trap to function Date: Tue, 7 Apr 2026 16:22:59 +0200 Message-ID: <20260407142310.2327696-6-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260407142310.2327696-1-felix.moessbauer@siemens.com> References: <20260407142310.2327696-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: FR4P281CA0367.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f8::11) To DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:47f::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR10MB6828:EE_|AS2PR10MB6376:EE_ X-MS-Office365-Filtering-Correlation-Id: 5deced69-ecc6-4a80-599b-08de94b138f6 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|18002099003|22082099003|56012099003|55112099003; X-Microsoft-Antispam-Message-Info: 3RVPyaP236bk+V982fkPOIELjeMD96OKCUQeg3n9HnfykQtJu7gLkFq+AL0yAFLHH1NcHJHQIAdZD7z96j4vmqPhFCgPH7t77JgtBTIwXhuIDy53IiHzqBchX3WjsIlyuDxAhn8V2IeDge7V/85bLGGw9ue3bGNpmIJjfQbuh1OSpx78TNBeWg+zlyJPbOcZ9ymbM9qNt4W0YZVsooGbJvzWQlsxlRs5Y0YwHIk13iAt+bNfYW/Qx10ND8Gxn5DwxEnn1UmZpJ2mPWO2/ivUG/5f8E3IOfVOQXrEXQ3ecq1RWDfIE4+KH2KvISo487TD6Bo59abQj5zob4fCR/eGkgO+5F7hh1WysMlU8k8KWiw2gaj240U+mx8DS++kTwoI/Mtd6p3cGBi+TTB2qURypO3Hmrp1fC1tk/dE2LRdTPOlETDgfT2jkxjrhfB4x0fsXC3md8GyWiKYDOcPqJHp/r81TAlNHMFDnbTIjroCYOxCiy4CgkEAoH+VgVhwi5gGgb4Ii7ukFCzLsG5RAjYMhbIM2SqVJHDIAUAtLvQ1aLeQ8L5ik6sYAXXKMiftD3HpfendSoIGf5mvohirT7W2IZ09R+0w4+MLQlEGOLRyKWmlj4U+25UklHOCLcecTHdokKRR6gQwViA9sUF58zVC1JWCmBPyOTv1XRF8NC1g41nSsulEmdSco74IaQMrAie10n4jIYgvj/w32DkSmvegTcsuT+14Si8WDJNKbV8hdng= 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)(366016)(376014)(18002099003)(22082099003)(56012099003)(55112099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ESH8/XEyqYSC4hnXhshG//SX9WhyRCbAGrDVyzUMcCCKpLOMFXF5w1gnbK2Lj2lZOl36wfyzVlew0/1vFgc1JgBgimsd4dz1G8F0153ixjiGGxxL7amfnzNDcfpJMBNgV8lu+VBZe3xs7r0/gvm+PxUKkmU1V892EQT8nh0ryZ5rfV+9+vWzkkl7nM9kdhlkbhtkwr7MHwzV4SjA4T2nC/pi4MxfnuFDUN1yEX1hn5lKr535uE9DA4Yvze5afdkJy6lOVlEAGtBdatztSxEuCfmPj/A58H2J5DXMVm/il1JF44lCQF63XZntfZwto69J3/aLyr0xLgvESXFpssly7pK7XMwzlkuARXi76aR8oXhaFkx28pUVd6PCIsfb0AhCiYmc4SZN1+ycLkAJONDvoIFRpZJHMCJs+VF0CcGGNrrTKipdlbU/Gdbe7jG4zWPY/QiMMPgl6NciagLcWrT4NmioSytb7TQ1zYr7xyltqHQPB73QYajA3n2wRC1GOxt6QMk18/2tPzJxG5yB+DJjDhZfLIpkcHSKtG4nKJpQ14xR2vKwEEBPHB5OA7Ul3fMGUh5iGJaCOi+XwBer5VN+MyJgdz7LQ7QMzXCP59vNJjTnkM32xOIrkKOWW9QmHSb6S5bwMVqd4IGfxqebTThQLqyT33Ge39NvP1y8ox8cVK6r/1X2woAKAE6glxlqax7dLuawDXrS7ALkM1mwX7r3hTWoNzllKaPWS6racuLvYD+7RnISu75TirvmoR+dJbr4TxuFf+KlybfsK5K/0Q+S+dMhsWSMLCt2QER0Dd7Jt00MLg5uMhasGGAmv2o5LZU0XVbCMdW7j7KuVJXm7NLCrh964V5UrXmWogDdhMQMdfifkoOwM6LAalPqeSYv9JtsnDCob9w5ThT6al8nY0UuS/Py5wovM27yibE1e/+Jci6aqyP9Q3Zuhvwh3lwemR3rFKR2SIMuctT9wM4vzFddWD1X2Z8xIo3h3Vb0vzDZ6OjUra2ey34r/PcSTL342C2sAawlv5Dnde6cIEI8v8Dz5aAMfxdWuz+NpZFMkKOP7lM68p28G07SZjYZ2fzHfqJ241XHtpw0LZn5459xf3XCazaB1+hga1PGzSAWdGhFBGcMg36c3HTwPM25OM2GLN+1MCEoIOlkwMHjnnoLkoE1hJUoEDJbhDEs9sH6CEn7/JU+zy0urGA+a84Ks89HFWS4ZobLwyUHQkCxQYhSxnuRDb5hmuwyVSFaJ5PKb8QLQQ5YqbIZzEkv8JfoDkoTzX5G/FIQCIpXWB9QEuTcGAwZiGBsJI0yyCk+pz7Yvwc/c+s6GGAngk7PZHu6MAS2Ld4Bh320VWW16fqWWGQJJg7ojA0g3e9W3N8we1sc6PXXS4NLDxVpDc0J4VxuEV7zhBTHNwZOxLkXVXIKSzgIJxkMfeXclXO2hVQi2ReDPIYuJUeEogyCx2WpUFoUevQJ5SHtXtjeDNx6axBs98pHRUWKlV/MRok3/Cz5RMBsp+UL07YHqaNc8Xr5ir2VYkMqpwcel9OOKJT5/Sott0g0RXCB/+U+sv9SfoipgJxoyn/8ul/N6nqC2N3jbeZ4Gq7BLFNRNhJ8w6GydcZb2T3rRzPXMEmjSwBtiu7zRt1JBfqotrBBnksWkC7QZhS4MkIdgWbNGny9juKYe6SE2f5AeDHx60QJUeN7wIH7LmdTjNSJ7ypZLLwOWIfCjJzXKNuBFoDYfCvBeIfUZ1psoYerd3tpBBOqd+r/BquzQsUlrbjS7Js= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5deced69-ecc6-4a80-599b-08de94b138f6 X-MS-Exchange-CrossTenant-AuthSource: DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2026 14:23:22.0513 (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: YiwRdbitI3sysSdhmQNU82G+BDUs5B2Es0/gE7kaV4+r43K4EXc9dBDm4ISr1PrxH8K7y/eQUb0aY9zOyMus6DAk2J7Rq6TlwU9xDQYI9CI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR10MB6376 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=AHE0HSb6; 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::3 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}