From patchwork Tue Jun 9 12:33:43 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 5123 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 09 Jun 2026 14:34:19 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oa1-f63.google.com (mail-oa1-f63.google.com [209.85.160.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 659CYHUx005494 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 9 Jun 2026 14:34:18 +0200 Received: by mail-oa1-f63.google.com with SMTP id 586e51a60fabf-440e399d049sf6152778fac.1 for ; Tue, 09 Jun 2026 05:34:18 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1781008451; cv=pass; d=google.com; s=arc-20240605; b=hinK4dYi5bV/UBzXCBUNW/hn4Qm2QMAJxzM5tSf9XwFqPijrCS17DpIcrXD8nYq0es dErCgSjmtcmUzz02NiV6gwMd83EjoHgAxkl9EM3FeaWRT5ZksA8ORMrnAWRe15iL6M04 fDHTCljOmvnNAXtiEOi2vo9I/GNB/RzJgM4c15EaV3SDNEyJkrqJWpeqDhxi59YQxps3 vP0gFKQGwZk9CS5UBPMoukG45Cgpaw7IKk1VaFd41GMUTb4JwFwq792wsvvNGd2aG/d4 XwQl+TaZ/YKYlxrbxShCEAXbpv3kazUf5GGycf6YBNtkQjIZ+LQSdICVBe8wTn2aXJPg SkTw== 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=wK/cvT9oFL6ndk4BSZ+sbVBc0n7kUsxD/xAkW5R5Fvk=; fh=kwwalM/lIY78i0+H2l0q66np/AT+PbIVhA9sRKp7eUs=; b=f+RsEBlfJLwMpQZundtZgQ+diFV+FBRcJ8cUgAdMA6GCbC11foko5DwkytjpTbCJIG I385qjRJY2xXwkn06PKK7MrSQCc41czTMeizAoPGiaTWB5JVfPfh8yWSMNE9QE7FBblQ D0lqWJjlPWwPAD69SzT35c5o0gH0RyeOMiGaQUWytwA+aAbXQJDfLdApb2hNGA5iEqCP 5MZBQzS5N92zSDondvF3Hd+x9MLTwBleH8cvywiF72ftpKEtk8nsmH64bLdYed7LFzzZ VzMrCO9o2IZWEv89gUC8/iz/FnAvZwkhpnAoTDgLlxXTjMmIn3x9WlokEHtqn1t1nD4/ j2wQ==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=b83+Xg7q; 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=1781008451; x=1781613251; 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=wK/cvT9oFL6ndk4BSZ+sbVBc0n7kUsxD/xAkW5R5Fvk=; b=NPxw6tikodZBj6JVuo6KbNh++Zi7mLAXjVjei3vrUBkmDoGpVMr21+6eUTEI+BNFZT So/zoMwSnETe7gaB8mbsTsUJazh2Umud0B0g0iRpzaBuN0/8C2fMWqPgJi3iu990EFne z6BeR0k0e9S4TONuIzi9Ly106Y4UjlmezPYj4HcF5Z4TlqLa2zudpLS9o0UVgURdMGIf HEkkSL4d77K4zYHnb4Zr4rFLPlMgDy8glQzqcwG5bj3kGttS+IR1w6N9gN/UHboLjvSu Gcd4xxaAOKoUX6KMECHb8j7DC+h8FrsktOOLqLCL+Lk1wxWXf/Wkx+raMQ0THNvhobWf 3xcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781008451; x=1781613251; 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=wK/cvT9oFL6ndk4BSZ+sbVBc0n7kUsxD/xAkW5R5Fvk=; b=KGYSW9qk5XWmkzjmUAVGe564EZ6RtdyvNx/YWm55bWvhd47EyHHGnGI6/7bb2PZBF/ 78iZ9SeYEnNEYe5l1Q+XmWr8786I6RHyypItnY0sITt81c/a3rbawZewp53ulphxIlAx eU/QIlUD9trFLYnntiaSp7f/TwZNEgkslBjeyqx+Gr4lhveeChcL2X+BOdfJ5wGAep04 ug+RQCzgzBO9tpzaGjxG5kQaDIBfh2nrWUby/SX8waXgrJhTfh8PmfOyw17jSfiSD8SB yqc3KUsH9Fx9nePnzEQ3prhFkIT+NqfI3aONGRIQHyr1omj0wdOHUWIjqyFMqRl1GOIG nQ/w== X-Forwarded-Encrypted: i=3; AFNElJ/epM6UmglFAqOp+wpl0dg9Uyl8LL4cFiP/6UJATu74GTxgKPocuCkVXel+lzGeO+t7VCqxp+o=@isar-build.org X-Gm-Message-State: AOJu0YyxyMKV0KpigwJpo252S+YNv1/8lwgtc1LhBgTNii7qnmxdjS3m AFAX2CMk2biBWFYrmUuMp+Yj91rH3ln3qbfqJc4PG69qzromQiw620oZ X-Received: by 2002:a05:6870:c230:b0:434:2752:34db with SMTP id 586e51a60fabf-4413d5764c6mr11297995fac.5.1781008451451; Tue, 09 Jun 2026 05:34:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AX0PUUdkgel8nPK9ll8RuD/6zY7OQNHvXIes5chvlVf9X5iwCQ==" Received: by 2002:a05:6871:3589:b0:43b:6fc2:7088 with SMTP id 586e51a60fabf-441091dea87ls2868693fac.0.-pod-prod-04-us; Tue, 09 Jun 2026 05:34:10 -0700 (PDT) X-Received: by 2002:a05:6870:5490:b0:417:6224:5855 with SMTP id 586e51a60fabf-4413ceb8f49mr10887585fac.0.1781008450581; Tue, 09 Jun 2026 05:34:10 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1781008450; cv=pass; d=google.com; s=arc-20240605; b=LKKgwGZW18vvvZC5a5Iv0+NcCYPbfY5xEA+AwtKfBW7gAjUEW3KG/XHjBKoGrbD13l rPtc0mW6ybKS+SxwvmqR8Mi9fFGlQ5FsUPxD+wc9YJYR7zH4jK/8RiWIQl3SxtX0R/qE PV+AFa8sdyYocBImiwCqQozBqOGi8yinqJwJjCOYA4iMm0pFme+KBp0nK+0c+NE2TUBZ M+qs7ffaxqPrA8TUsrxeZhL8sYPM2BPSnxZLtREbvjAj+Rq4d9A/nT0Nj4QMxd8qg51u KiENotcH8IRE/2FIjgz4Rl5VsFvq0dzKkpOj8ISOU2jndNfG1GJmI6HcPXQzFUrzE5Dz vofQ== 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=ZLcTHqELcxRiY6lJllQNIj4DNwEGWYrRNMjCusgFhgY91Oi3pVcignYKqPSo0HghNn dTNsXEWl+Vg48NUwk10MdN1l/j/G1HeOnK0PpM+WlVCtdf20r4bLj3WMxu8ca874Apxc ArLk3aob9QktKUIsdiMKzhTs9td8YXsyUj9W5x2Dw8GpefAFp77gFAgbwPsnsjHMdLbz 9T/Cqr+RqEH8lZB4q5DxirgWxZ51nzT7NVbp1Q+ZcYB7+8z7vKV5oC0ZIwnIyvtm6xIB Rz3YF4QUBIjcgT5nZalft2CmNyFf+4rEhFa5gfkwzTjJaZj60X3z+2ip9gsMVnOv71Vu S7EQ==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=b83+Xg7q; 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 586e51a60fabf-440d825e1e9si665814fac.4.2026.06.09.05.34.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 05:34:10 -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=gjVQvGtKv6cWjJ3o+/05ygS2mJzu2smdI4wdo/dti2F8tf634COJItJIbugnD7iFnBZHz0xBN7sZYD9WD4KxAjll09x7RK0CMXVdKA0CzyuuSIU4Si4PR48xJp+7fHbj1VQwzt/NyqgD6RAKnO7brsx+t+M9u7UmKA/9hx3NtYYqk/w6rC5XBIH6UVZPZnouwdLUwcueuhaMyH06FE90C1PkiSEMnqdRlljPa0GWaicAEnpG4F9lsP7sodlhqUG29zcxAwt7pm0ypukyBdBQnvJVKeppXnpZ/Jz7C58SyisKiDyxkxNwJdvbOyk3+09RPg9MhWf+6OtuT0su8JlqGQ== 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=BmszM1N0CDh5smAeZYJkqEsE0QLFnI1txU7N5DJJRfspaighiz269CKJNK1N39Aoh6h66VcsAbVAsZ1IxyP9uTuPbGW0+iJqipJiMuUxQoHluQ1N43tnv8PD1I72Otw0TnB8rHNV9lT5P/MyIH0rpnEwVGwNjnFRCilHsvkiuerX1PtzlviWabOgsO/iti580JsbkEex0TzEcE947N/Yp0Tyeht3Mas/rRyGVUfPKmZfcUJD0sATA/puk7KcAEGhIxtmTKZcByEZ8tQe3gi22IeW8ESAtxGkzpX+g/qh0DBCHgf13r7urGKOvDdcGWpV59HgvGOYzsi+ZRVpgCv+vA== 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 AS8PR10MB7254.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:619::6) by AS2PR10MB7024.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:598::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.14; Tue, 9 Jun 2026 12:34:07 +0000 Received: from AS8PR10MB7254.EURPRD10.PROD.OUTLOOK.COM ([fe80::c0c1:ae4a:a803:8b8a]) by AS8PR10MB7254.EURPRD10.PROD.OUTLOOK.COM ([fe80::c0c1:ae4a:a803:8b8a%7]) with mapi id 15.21.0092.011; Tue, 9 Jun 2026 12:34:07 +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 v5 05/17] bootstrap: move cleanup trap to function Date: Tue, 9 Jun 2026 14:33:43 +0200 Message-ID: <20260609123355.2368573-6-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260609123355.2368573-1-felix.moessbauer@siemens.com> References: <20260609123355.2368573-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: DU7P194CA0012.EURP194.PROD.OUTLOOK.COM (2603:10a6:10:553::18) To AS8PR10MB7254.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:619::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR10MB7254:EE_|AS2PR10MB7024:EE_ X-MS-Office365-Filtering-Correlation-Id: d23f47d5-4ff4-4156-da44-08dec62365df X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|55112099003|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: AoSjHHRz/4/wIOcEQu8VukW7698wK6ZppcLdjWFYi4Dg7nhE0GekLJoznmoyGpJTxmjg3ndnoaLFoAZNLWFK1ceng7wzYD+rxoaY/wn6VFm/lXDiZI49DUN4nesHQ1HUYQ1ZSz/d7DeIHaGohczEiTQqcRp+8g2yg5MnbUgTfyzxHi3PboU2u9m96EtttItoxQTd5OuP/wxoeAqMrImKbcwdg7c4QVt6KiNNR19prZ+0pK1uedaeEqyN9e8TGnsgpaIN5ArVpZjAFl2nlIR/vjD3s7jqaXRLudvFFNcNAkBGVZTDB2Ioj7Sn5mFN41JYnoEUX2el2uHoleWeUOD5jTXZkjGLNvRRERj80oRZwY7uzzKzMZqs+vja8qPKBuz1JbzVGb1pWO9yOLg56l+mUaiAByuLrMtLtyzR7tnpjJ04ZodBX2lFFX+WNjPlHpVA22jjW/MFkySC6Ow2MShrZM0gXgdt4dk/Obc/hr1euPYvzZcIgZSCDf+QJvhkiyW5IlZ7MabWXZM3h5hcOJcAoEI5MyJRERJQzxteT1FCTX67TI3y/cHZqDzebA0BgiUBCnW0CAvsy7g+Y9moBlmdjEfLMqsWK5wOYQAJhrbRq39dJu19g2sFdnyDiwQrcp3Xj1vShcuw+rbdIfFhQYIuxDzk1j3Kclx29Br/TTaxbZ4iC7N//Mqg3T5ULTXnaX/X X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR10MB7254.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(55112099003)(56012099006)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0mFHZPI8vDTHDh589a67Nzy6L+SUyaSmIKC2p1uXpwX+CnfrqTRRAtJnZzHAnVn+n557t53McmDhvUGOFohz8x/Ec0WTO0Plw2CLvBFVZgYFm7QYXtkxaGITYivtnS+x2uEj08e9OjPuJ5+SW9mKOLZEJvRdHH95AJRReUOymZ61UaGJi2RjHgiQHJlZSjw+pVIkP5oKLtNtABGSBqnicp1JnBNJVy1dnt5b0NqtO3Y3RfG2vxCsgjLh06S9TitQUnlQAHNUYWTMgLG0n3RmNXMVnX7XnatamVbXX3DY20pmwbAtEhUSN5Am4QvdrbHfLar1g1BqRzNSWUa+zMzRHOnGN97gNEI9chF2dZXuY0qpTs3xmTuOtByLkFuMkPDra4PNXG/h0wm3n/87JsHRylkLhvLgeBGH/7rSD29L0NURY4z4UxxHpUkWQ+A+VsgPhSOw54F4Xf24sxQWb3r/TBdvbtVZ+zsKw/C+ma66KYHDnMLaTL0y/Xbd3A7FPlWgFlm+7kt9+uYWfMMGpNN5cYWAXTirxykbkILr6K0JrgT4c+gRqFdNThs+2GXu45um/KYxuyvqDVSIZCe6Irytb61dUgXQLSbG6k/tnJce9+giQcgNOZSGAQHcJ12JajtDtcpAlLzb/2lNgTQl2e1n7D7SQwcBBgkcsoabp9zYsAs/rRv3a1l2yvU610xMGZiET6qcwZZYQQlrCf/79XlIPFKJX52JnclMJC3OpZ5nc2C9wl+9vKZp3lIr9bg3oGb3ixJdKIbxaAmAjPPO3NU0+OTLjydG2qsAmh8df/1Lk/gTakqQEFgceIMKwCU4TBhf6oTG0POLVosGDAUXimPUwq66WJQ7zMCWsn7ZiBdQrz6Gb1SltZA+9LsHQ3SGxE9X69UhpZW6W0IkkinQL+UvPv6H/YthIIPYWF89YpO0KCUvZk5YK6sMqQbEI28upqiGZ6k1+QjjYYD8/E/wyXQIuLT+z+kkRGP0r+V3MIt9UDkdPE7AbAuJyiJgGXvWbmcRSr0/VmNDrc98brgwK9r6SykVBlO9BD7BL5i7AvYPQIc4EoUcQ1UmbQqFHyMaJcklK1Tdc5ovZZ4veU7SIoOGv6yXbxT6nMONBaLC/ybwZaXZohK7sYGrRIYVKRIPA1WwCjbykWFUXnPqC530o3R5EMZVnNtzvd01rzMf/nxUZkWEYw9Ew70J7KL62U01B9nE2iPiDzZqnqPPUsQ8h8nak8rM49pGX5f7osUjxG4J7KJiSifpklOt+NJJRXnXf9f8uH7hP1wbZ1VNdDTPK2wyYXWyKQktkzmN1UwuzxjWj44HZvNzzPd5EkpWEv0yf6truJ5mHtnwbamEUPuN7Hyw06eCEnM9J0s4dwVsrCIjM1BthHYouiTejYRFeQwFEHqcT0106LuzKVPAjWdhxsjGCQNX+NdC1xKGWNEWdNYMM2NuzsFycTpIrIRbX1NXi5rYf7lgSP1FUaFpIJu3D/q0UPwjpedZmJ1XZXGs6ZZnbGTkYrJhFDXob/LDR1eB53yNOww3QLIP3ZbTk3P6ZAMlhf4iHtZtWiopnGTjoPqjhU1yopLqQ1SG1x8RwizedsqaGj0ahmq10YUBe0Ae/2gRp9r1yql8/TOMSGcxyKw16URUngAlVRh2nSr2HfnwXsmIplQHxYHFN6Ht/iO03uUIJiQsixC2YMB2sgPf/ohdmoMogz7z5YeU96+knvEoZ9HQwBVCXnXZyfTEUl3gCbVhcM8m9WFj9RkIbC0O618uYPM= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: d23f47d5-4ff4-4156-da44-08dec62365df X-MS-Exchange-CrossTenant-AuthSource: AS8PR10MB7254.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2026 12:34:07.0190 (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: 8U9c6BO0BS4Z60hzInLxp7C8jfzzU1SK4hiN2LFCjZloj+4AvqZUW/Eqn87KbeCvwid+muElk5EevEIrHCucwV41LcGT5TGnumUgvZAwE54= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR10MB7024 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=b83+Xg7q; 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 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}