From patchwork Wed Jul 15 11:05:36 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 5234 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 15 Jul 2026 13:06:18 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pl1-f185.google.com (mail-pl1-f185.google.com [209.85.214.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 66FB6G3p022840 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 15 Jul 2026 13:06:17 +0200 Received: by mail-pl1-f185.google.com with SMTP id d9443c01a7336-2c7f385887bsf127461765ad.0 for ; Wed, 15 Jul 2026 04:06:17 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1784113570; cv=pass; d=google.com; s=arc-20260327; b=fsBa63qP4ip8HzgXhYoT16A19kWApnYkbQ5YXPJAULNbL03fUeVdj8f/bhsSzRRRgl J6VhM2uYHigZn8id0gdpQXEKrrXFrRZlpckV91SszDMrtFyt3H42MkrurNBnfBAgH/et 8jwZGdweMRzfFelZDONSJvIxBr8O/fkaarT3TnWuselW66HxwpPtubWQzJEztKVCiw6S 6QOtN05OuE2U8+TMkNCj6+eFDVoJbQ1bz3ObyXxrzOtNv0GHivo+m1XcINnMGuMuPUl/ P+Cg5kuRJdT5gBKJCeZfBeDwFfOMzrORQeSuhsLBZ47XfHMR6wg+R7XythApThSnRDTN 2D7Q== 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=sZ5vUPStPRsAToI6YBEIno2jpvQGNGhuLENCDxayOfI=; fh=5GcTb4YirKUY0fg8xiuIonQKOz23Mw4iGDC5H0dW7A0=; b=Xi/ByMahYShsEcXVoP3xJe/SmXEswasACStKLeWbvq/NA9FA7+TRxygTVok5/mE+t1 Ax1zbrFJCmyCKcu0+OkFJwZTzJQgwmot7mIN01GKJo3CsmxYMYL2ewPDcpvZf4ftCXfi b/0Ltkq6gA3fWj/wSP4xh145Tv4n1WCwa3CMPUA4isHQa5j2Ld8vcyhoB8TD30gyYu0c Z8K4OXTca+O03Ugw02MSfk7yaGUHNPav0aXaA8ESkYNrS5RKhmxHwu/Hq4A1VU7HuXl8 c+lSRRuWiu0AKc2t5ZaOE/ZZVcMfemRrpwTAJlBC74gxpGzisiM+C3FHbIOlQtC8lHVG ZSDA==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=xDqKk56r; 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:c201::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=1784113570; x=1784718370; 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 :content-type:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=sZ5vUPStPRsAToI6YBEIno2jpvQGNGhuLENCDxayOfI=; b=HmcyNeyE4MYYEAnFmGDd3xh83JKo0MFxAS9tIjo5kL1/D7kgmBswAFcwnkHEKO0EFR L+lEGEtDHW8x5BXq3L8x2TiTyZlVgF/WLsNfL4szOS8jtlY/tu4lgVwPGEHnvMvsp/l2 QewAvM50fT72ElhAJSWhUaf22k5xayp6WHkwqzYgYwQA5CLT15SFW7NI2AxdT6aFqcxn dIU/crWrPCukXA+LjH33fskdJF9oDrLDIZLeCj1K3W0tuh3HItHDJjeqYqlnDB6xKHx8 lmhc7yQNoR1kZhjvikDf/XnhtuHirCQB9U05NAacsLGJO51ZTraUeDKCkS+axi+/SodA +K/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784113570; x=1784718370; 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 :content-type: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:content-type; bh=sZ5vUPStPRsAToI6YBEIno2jpvQGNGhuLENCDxayOfI=; b=cE5Xg6yE6bVgyCI/xC43K0qcRk3xY1WPNYGpMVcPPO2N08sE/q58Mivef7rFGCYQZX zDwUr321JJEHkeyqWPsgMGpBUOMgFE4lT9b5P2CUrnrrx7XLFZTya/TB3XXK005YXkBi CuCEZN5fOdB8wfN/ugAUTQiak5BDvV07bgRMOfxLSw9T7KPoFJ6WVX6r1joJfuSm5mSq m6d+4xFA03qpKabMoVdb9W8SUMj2LdRGY7NauPXqlh5LgnbuA7mfHNQNHj45HavGVo5H ywGZ6hlOhvasDYpTCV1GOtxa4LZEaCYGI+ehT7esRRkaE9OAjQOCVKz+hxKx6N5AIq7g gY/w== X-Forwarded-Encrypted: i=3; AHgh+RqTIiF/ya4wBCR5de8OIA0n9IWz/FqqyEHvcWORLTbUDXBxQRsi0JO/T7T5zgY3SL7YDQKN28c=@isar-build.org X-Gm-Message-State: AOJu0YyME7ASTprpgCC1qWkkip5zwiBhZA/lVRxpZFjSt5MCMdiO5vDc g6sCcfChuNrdnM64p9OgF8kHCoPtjlMsPhtvz8BXUTBtFC26z+lCW4n7 X-Received: by 2002:a17:903:2bcb:b0:2c9:cb1b:64d6 with SMTP id d9443c01a7336-2cf03c391bdmr19305055ad.19.1784113570004; Wed, 15 Jul 2026 04:06:10 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="Aa7YSPRB5d25dbMjTrTH4cakZkVSnabcFJFcyKncHRSQ2mIXGQ==" Received: by 2002:a17:903:2446:b0:2c9:965e:5bdf with SMTP id d9443c01a7336-2cf030e4bc2ls10559515ad.1.-pod-prod-06-us; Wed, 15 Jul 2026 04:06:08 -0700 (PDT) X-Received: by 2002:a17:903:1cb:b0:2cc:1452:a014 with SMTP id d9443c01a7336-2cf03c36420mr21434715ad.18.1784113568648; Wed, 15 Jul 2026 04:06:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1784113568; cv=pass; d=google.com; s=arc-20260327; b=elktfehsFFDeIOH957TjwZlLA4zfyiTOIS4HUi8GDAPyrcFfZYO8l5Z4PmIVB1v0XH 4KjimHESfHcTKDWaUDLd7Yg12F38lVAYtRz1osgOTGseM8VX1qKRreMo2Ff4sWOGInQ7 L1QDeFUJUeoUr6m9KYDIUq98BbAVzknXBK4jeSDksGqlU5lPa0GyhGwBTmMrNKh6iH0m m0T76Ckhcd++FJbMQ1IFrGRfhhr1dFKDdzkQA9ykwisvwqCRWpJfqpsT13tsnO3Umd5+ qNtFEiEWnP1GsW/TQXOPF1D/y/yRnfIEOLpqtdn8KJ8FUOxmYRlY8U/lLh3vuk/4vFEr tzIQ== 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=pkolH3VOcSMhqvY+ejeV7kqhWhZyhLV+F7pLap9tbWI=; fh=WkhL8kaJc+l2wQon1t06Ej3uvBGj9sVhNcE8PaS/XbI=; b=Vad/eXL7ERqTM7zxmxui8VdM/XFd5S5ngh5JWu1Ymys/tixRBHa76qfXiws23abgK/ Gyv9DqELQctR2n1QT+8NhXGuzWLjiMGZKNVNCDlAXSvxxaCTEISgYLaeaufCHpLbn37U 4kOwUYhMM3AdAluqyUkEMrnUlRN4BWhGgg8CVXqwVQfCeqsb6rMHeWAFK8EJm/VnH4EA 8oQkPGWNHBsBDlApNXTDbAu+iGyItKIuoGhPuhl95HiZwd4j2l7Nc17Kcy4+Pwe3FIsl jtFKivUrFu05sEq5EEmc8L8iRdPPcRGNAS9rnQGW1u8OzdOoF/Ptl2KQJZIOz3dMmB5v kAyA==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=xDqKk56r; 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:c201::3 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazlp170110003.outbound.protection.outlook.com. [2a01:111:f403:c201::3]) by gmr-mx.google.com with ESMTPS id d9443c01a7336-2cf10489ad5si21625ad.8.2026.07.15.04.06.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 04:06:08 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c201::3 as permitted sender) client-ip=2a01:111:f403:c201::3; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OkaGoSXafl8ttwk22Lp1lkzLtKQHedhPXWBy5PsAgzXj6q7HDd29rk3n+OSyuTjmHG34A0oG+qZQuwZAbn9d7MX5JIIuDpNK1UiqYdKZaSIJ7f0RZpyKv+bHy9OYHiY3rFA+LTEtPuGtGe/5tk2TxpellbEuB9yaCMdKVMsxadeHz0RyjrwPmb/anOCSaIWZ5KkURfWlIBFvZWQCP+b84PCs/aZKiQk7n7+FEQ8F9GKW6BhfJVlHPMo2siyQETPt5c9pg/0JjIiTCj2KjOp/xmaXqwAehtk4qJgvpk9VgYXJpCcFmKs3BIw2DKX1iIEGcl0WOMaaBF62I6Fd3+JrDg== 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=pkolH3VOcSMhqvY+ejeV7kqhWhZyhLV+F7pLap9tbWI=; b=YQUhNkhswJFVTyHpHeNJw21Cs9IClnGI2aLDwVk+FJksy79b2FxtsR0U4UI+hg/fa+4fiCPVHRW/Z1dluIYWUqgmjRGJTWrNQtzcc0kzxYy8hksZOOFjF6waWidNR88CO5X2gSnI8Q+wmeKJ+l1D6X50mh0dKXFrlV90eJ+0eXdMLiM52tIb/2LDIzYp1tk7ycURURHXH9eD+n5ecWF24f8tAIxLLrH/vhBNt1Un6LadBTo5sGPEGPR55+0yC7x40gZGWtpslFLqxqHHWoeX6xgHPm2cssN6Sj2bRlUbKuDma7dDdoeYU/UuXqGWolLDahp/FNF6kdbcliNuN9rZ2w== 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 PAWPR10MB7915.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:366::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.223.11; Wed, 15 Jul 2026 11:06: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.0202.018; Wed, 15 Jul 2026 11:06: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 v8 05/17] bootstrap: move cleanup trap to function Date: Wed, 15 Jul 2026 13:05:36 +0200 Message-ID: <20260715110548.3605767-6-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260715110548.3605767-1-felix.moessbauer@siemens.com> References: <20260715110548.3605767-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: FR2P281CA0166.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:99::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_|PAWPR10MB7915:EE_ X-MS-Office365-Filtering-Correlation-Id: e799cd5f-c4ae-44b7-a9b4-08dee261104e 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|10067099003|22082099003|55112099003|18002099003; X-Microsoft-Antispam-Message-Info: h51IoJLbDgOv/fmxlzTGwqeLOcmZTPbc7wuSreTi/kA96mxK10flUAcaS3fIHQ6Kj48ydNmDyVvDFrY920/6Ti9FQzrADBTxVoDW9EfclHaXsuJyWYVerS9z3ora/YGp0gCis2iTON7Xlc+SCt9J4wDUt4WYfQqccS/pVLM84hUVqIfA8ZkysE0TBRnwynCfwIQpq2bfalsqrwlM+tctwRCSwUncK3N1uQqHKFjbgF3TovBJkM2sBMjuuE1Ih0SC7SlhCzBy8X6jyHcMvqrGZWXDHAcd8sdz46OMx/I2rILU/EDiP6T2EQampZC4DZCdDvFePDsXHZrVBHmX1zSEghL4nO5F7naaryrBFNRC+OfRan96fBF1xW+TBdBi6BRUba7shHUUWvg6xZPlbGDGh2EH0henDHmrA52nRC4SnpOKQ4NnN7qNuwZTx11w5ukfGE+whiA+1WgQUjFdM1z1L0JN/oVHVMh3tWnlJiCSdvtLMntrClUxOyTgqgP5XgaS6HdKy5gcII11baBmom3UAV9M2BillNLw6nNP31i0kzn5PJAASXouvh9X5l7x6Mj3ysFtYR4waP4TksWi1Vk8SZMvisHe/tJhnf0MGNROzhp/Y9t5aj26vbcvCu6PQp2WWFpURsTx9JgRQj8K9CClvlQ29+vglaAVI+dAuiWjbKk= 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)(10067099003)(22082099003)(55112099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: L12XL8uSDWwy/3fspJSzKJvJg1zPx+mextoeEqk+/7echBolwiipOY6mYHUs5NUAaLdoElYJ8+9VLSMUhbpdmOeALgLZnSdTpkRiW2lvmwLz+2m2HqUQzvUu0RTGsNZ9yiOOp8GcFyMfTLaxRgH+bpU9qjyu1WslOGZOKwfcDErlNfeAkjCCdYh/J9NVXmxfaa+x+b2RLNX+bvj3OQSatSlh+0h8utl3P5qrlGMvE9aj+VISYJVAZ4nFr2IhhmKHiFnV5lnVqumebt6Shlcq68lDnE1x/3XufW+2y52BDxoXrMNL+wsBrhl9lWWa9FG/lG6B24tlRKDULytsVN/px33qUaG+/Zq/LGYrjfubxsvgAhfWDVBxFisJv9AWvysshroz7B93L+Th3lsAKfDaL95CwHyUs6g4IrjlzSbaLCyf5foLx+yXC13lvYcbgw7DS+kQs06xGdxz16QZCRoFmgJMkU1sJXvAVDg2ugAVqy883KNkZ2NhM2JBUVwuih96J/AtMJuoGPpBR5URVNcuJw8vVbKyv6iac8WCI/CSgfHL6ai+cN68+70fXLYJEt+Jjj1/oH6n3xB5IYd5OHUQsNqtd5/3aKwXu+BJlKAdRpZxMLeY1bBf/LYsoXEHmGAWdwZp6zjCeU6y/sHYBzvax7i5eu7bIXZ+1FJVZA/ghRvW+uBOGuAcsH83MDsMjWJqguGpZjiSXRmjxHtIKBPQjeMynSQaz9gvRwaUdCkjO+CydRNTb6TrNAhvwIK1sJj8gsiNGl91zZDCV+av0H6eZ28SodneJbPNEqrs1kmjl8XM0Tjrzc++6CGPikUWGsdRoE63ywbl23+sWn+N8GJEkZCBaKydqONV/5vZemaPGUwyQCEKyJiTNUfmVKOET+Ei8QAWhZy7I4wc1sxhinv199t3ogSpF6okQS6WLfRzIut7PL+09i4lBPadGaAlr1xpEAmzBtKCpLzIvWu0PtX1owprZaL2dPUetPyTvBf1VYyZfVDEn+207vuvNGaqM/VrddevOZZHRth5cRe4fM9Hx0G0ZMSQVOHUR9Z0nV3P45B6+HCx7GULoi7VaavE20yCRmIMRitWwBqTAYpo5/Q3yWZAlGQYKLb41d4NSrr2v7ToMXj0M1uCDw2TIfWJ19qvElMaQP7OCvdu+oVf9EYd+tOhG/XHmSEmtOvxvqerOX+1hdfy4wTR3bqVf85wrBW7HS2owOdYuxvcCVZ893ADj3qjh9wD1LRzLGGvwPSsWPml96QEfUxWQfExQGGSBwJeBijZRZD1ex1Ot+uHD/z+EcFAx99Pr3za25RZj6VfkKSpB/VFUJq8yHq18A1GYuehd/y/THqfEvJgxXtoysfZMVfecRcH5s2K3Iv5aR2yjOyittp4j2KtNC6w5s554VJEMhyAEb1FR3HotO9Gy8QRq0nZHT6jtmPDo123f0tq9a2J6/mUhJ5AzW52H4ziFIkdFn2JWXrtMrBRrO9f9R0F9Nw8v6MXL2Ee7pCYqANBSOaq/eWopcP8C4dDMe8v9F/82NrzcvAG5Uwo57vLMqpTmRv/b5+DozUhNOyOIMGcY5gwCDk+GoWGSKk+oSOrxvFmbb23i3gDAbYXbykuACXjJGm1dtl1y//KMkhfLkQ41EhqldDQi3Eh7EP1CPS48yYIClmj91J6rh/PudqUZUqTCSJl8x4xFgvZiVBPzHiZHGlTI8UzFtJPevfTpof2Cmsw/TF19CMkDE6YpWgiHPbwMepkajLyXwMKqisFk8lJOmgZwA8f/4HH38gDXtcvpRItXmD7X812 X-MS-Exchange-AntiSpam-MessageData-1: A6TaH/LOCLUOQTy7hLNTT8s4rqzAbdPzkko= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: e799cd5f-c4ae-44b7-a9b4-08dee261104e X-MS-Exchange-CrossTenant-AuthSource: AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2026 11:06:04.7786 (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: f4V2WQkzcdjRdZOtHXb93mkkVgmqkI9qiV+gzXD7BCvAt4q82OCk5ZDaIipm5+0RUsKb/XYJtYYGVAylSghcPPbkjXzZNzDCxGW0YF4g4VI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR10MB7915 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=xDqKk56r; 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:c201::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 | 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 74ccd8c2..711739d3 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}