From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 02 Oct 2024 22:32:27 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-yb1-f190.google.com (mail-yb1-f190.google.com [209.85.219.190]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 492KWQgQ020789 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 2 Oct 2024 22:32:27 +0200 Received: by mail-yb1-f190.google.com with SMTP id 3f1490d57ef6-e24b43799e9sf277331276.2 for ; Wed, 02 Oct 2024 13:32:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1727901140; cv=pass; d=google.com; s=arc-20240605; b=Y6Ekqogmu+SXvFVfEJuabqnwv3QxwO6HG2T06rTbZsmEPfnTXHW7/fwIYovyzFpNhT aS56mgry5rY3bHwNL8tr8TpYjdfKI6QXJhzz95XoksAIqbBOiPLlUHoFMo0+gxMhhNM9 sfD1SrtEG5OfTi+M2DPSq5Eg8AHw8GtZOewtO9h3AdV8xuJ17JpB9wlxLsPJBCFhPw3O dv4Z/wHtZB0DcWaxUzBtTzYSB3FveoYKuB2rzRpbsW2uR/YsPkATW9YZ6931uKLBNY7h Ef7U7Pbm9SH3Ns3sIxE5Ff+aJOPh2jwx7byLFwBPUJ0jkOuMPFNwv4yHJq103RWdfg61 8ehg== ARC-Message-Signature: i=2; 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:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1hsudDjOyuRFfzzbGiM4xmfPibvb2weaImalcK1c330=; fh=UJkJRxneyhCMRyRl1IRrTCDGtzbwBhU7UVh8BB2uwqQ=; b=BzTIJbod50xHQKn+DVUeonGY0QQGMLXewfca+TBGv+8hrq/lu1VZFJhTAhlHVK9XwR jlHS4m+t37/DrJG6iMBW6H029Zz94uHKxvNbDmotpyfLxd9PyTVrkaNqYyMvaoN3RVBE Q6+4FWdRxFHwm6pIIlX+SELZ7uOhoTrXoZBLI1fqbEph8qPGjBoa31PoYM9DRIiNqndX 9yJVr1agX1ArOkS+3gHz5GzUsJC6mvZC0TLfWklO1peLBkctjSNqfXutr7vXEAQuWvWi ghpfdybegT/QC5Fh+DCGcrm0JQ8tEtvDch2AOUSOrXucdF+9Vat4rW3bvUeXT9kWqk1g imfA==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Xneg4SC+; spf=pass (google.com: domain of fm-68982-20241002203217536c2dd1abab60accf-_dprz7@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-68982-20241002203217536c2dd1abab60accf-_dPRZ7@rts-flowmailer.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=1727901140; x=1728505940; darn=ilbers.de; 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:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=1hsudDjOyuRFfzzbGiM4xmfPibvb2weaImalcK1c330=; b=vp2AhYjDvtyDE5aQWs5MUAbQmpd5p+0MQVcGaEu0KfQGZZBgMOh0QLCTUSrH4wCqkw Zj1TVGMTToKSSwpM7C8UtbtA3RPxKvHaBGUxkG51O3TkmKRjGAFSTygz8jmwjocMxJlN 8OzKEg0o3FVa8/ywjPSln5ykrnYgsbPvCTS4Ot0w8EjvWvx+fICZKNxR1kfVAfsWHl/f T1dIXfdtljonHeuNdJu6FBTytOuBnIvt6tWd5Dp/4rdEbca6/d9rid0u06PItJrHIVUu L77ffdTGdxNapLMYMlPlf1OKOcLKI+X0SVi+eiLgnpFDLcLMAfgOLJFbg7t2Xw+ojstq jkNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727901140; x=1728505940; 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:feedback-id :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=1hsudDjOyuRFfzzbGiM4xmfPibvb2weaImalcK1c330=; b=NhiZOAAeHM9VMzbN8kAKw7XoFC3op/NZsac/lZX6I1rqWgz0kBlYkacX6NiqH2Rab6 X4RrmRPRaQ4Dyi8CeZ6ilfPfnqRAHnIzumVOiV2P0dkOTb6YGOUsZMPxlTZjgRzGlEdY 3dLsmO2o9paQeW5TDbi+vNCHblsHDypY+Lk8B0ozdTX/q44gR9qH6Q/EJJyGPKlQAmKL ZcDW7E5+S0FKb3bLij7URKrVZEEkPs6IzZ3/sLXZWSRbveEucip9Hdr0QyOQmYNKvjLw AZpIFDn6hfJVM7jJ1dJcRil49uR6+837mYpEDB9tqIYL9nQ7zS+6RXwqhbpNnf/bUBzt lYEA== X-Forwarded-Encrypted: i=2; AJvYcCVfjMsjorddek7U4g3m+INBG5E1bevT5h5giCUEgxLdiWAxQdMWko1iroeyTB8t0MNk1gBl@ilbers.de X-Gm-Message-State: AOJu0YzALFT1wVbbN7Bd8BYpbZHmbzxbw+R+rUDjA5ys/RaFk71S6qey JRb4fwYcg6gSeC2ykzSIYXhm9nhr5TX0hAF0VoN9ZXEi4oyxk8KQ X-Google-Smtp-Source: AGHT+IHXbu3zgVwoIk8skkCE2ittMd27OtyTJkXsYK2/yWCj6BPOh7obexs59kHfEwMNUorg5F9ycQ== X-Received: by 2002:a05:6902:2608:b0:e26:46f:967d with SMTP id 3f1490d57ef6-e26383b1034mr4155175276.23.1727901140477; Wed, 02 Oct 2024 13:32:20 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6902:18cc:b0:e03:aded:7d3a with SMTP id 3f1490d57ef6-e286fa4dd1fls435281276.1.-pod-prod-06-us; Wed, 02 Oct 2024 13:32:19 -0700 (PDT) X-Received: by 2002:a05:690c:94:b0:6de:2ae:811f with SMTP id 00721157ae682-6e2a2e052f9mr40941097b3.35.1727901139652; Wed, 02 Oct 2024 13:32:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727901139; cv=none; d=google.com; s=arc-20240605; b=Bc1xpnYYBGsLm9/NFQKsru7AEiskYO0KyGLfbZKdGCJP1RAVoxUblUAyPQbyBdcIFd IUKtq1obZ1E2M67P2y8TSCtT4tT/W0Pf1OJSdM95v+U5RKkVzS3fouI0wAyBruURPE/S IZuG6iGN1AjS+QY5qwt6GEys7dtvX+6sc7onGVhjLRtqsIHq/JPOAcYiBnRwLabo+Grf 6LpH5IG8JyatM9Zn7bjC0EneOJnvd5tV/fFXTSw8RE+fks7tULAT+RUbMOHQv1bPbo2N l9s2hof3jXbOdjLTvYftA4JGMH/q/koATSdUF2Qh8IGNylh7ZnuMLeMvx/MUF8LJd/LU QDTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=3kw7gvRWc1M2oGZmSY9anqJtiVVZV+g12EJcMpV7nvA=; fh=3XHIu/InRAzp3Rp7l/ptHNRaAKFVDHN18ga8bDsOpak=; b=HikBP+IYVoBM1r629kqxS6K7qNBJWIxSHvA0JoxEJ58amOR3vP7iNs8RKZX5m5ZyZz OqAinYmZ/jBzXVjMprxz0978NlOe0URxgggOY8iJEMqOzWfaszJOzFDTBBJncUYh/v8q i+/O1ju3mSz7ADs+a8g6CqZhxVVyBR3p1AdFRYVxziFXn+eMLGCir8GOalZ78uiL+Gl8 wqkok6m9J+gsFpDiGwirR6EXxOfY2y8XTGx3ftxcDlUOruX690/Wpqn9rTE4u3pqlvTn LdJpaxqlh9NCZbC2JP2ujnEYyFOLPQMS7J6R6mTI1lprPJwVy5dKor0JyoOIaaioUOYH cV9A==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Xneg4SC+; spf=pass (google.com: domain of fm-68982-20241002203217536c2dd1abab60accf-_dprz7@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-68982-20241002203217536c2dd1abab60accf-_dPRZ7@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id 00721157ae682-6e245380df1si10540827b3.2.2024.10.02.13.32.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2024 13:32:19 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-68982-20241002203217536c2dd1abab60accf-_dprz7@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20241002203217536c2dd1abab60accf for ; Wed, 02 Oct 2024 22:32:17 +0200 From: "'Florian Bezdeka' via isar-users" To: isar-users@googlegroups.com Cc: Florian Bezdeka Subject: [PATCH 1/2] rootfs: Add missing umounts in rootfs_postprocess() and rootfs_install() Date: Wed, 2 Oct 2024 22:31:55 +0200 Message-Id: <20241002203156.149572-2-florian.bezdeka@siemens.com> In-Reply-To: <20241002203156.149572-1-florian.bezdeka@siemens.com> References: <20241002203156.149572-1-florian.bezdeka@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-68982:519-21489:flowmailer X-Original-Sender: florian.bezdeka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Xneg4SC+; spf=pass (google.com: domain of fm-68982-20241002203217536c2dd1abab60accf-_dprz7@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-68982-20241002203217536c2dd1abab60accf-_dPRZ7@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Florian Bezdeka Reply-To: Florian Bezdeka Content-Type: text/plain; charset="UTF-8" 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-TUID: gZ3LoUMQdZs5 Calls to rootfs_do_mounts should always be paired with calls to rootfs_do_umounts. In case there was an exception thrown within the try blocks they will be re-raised after the finally block has been processed. This way we try to avoid leaking mounts but unmounting might still fail. In any case we tried our best to clean up. Signed-off-by: Florian Bezdeka --- meta/classes/rootfs.bbclass | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index c67d3bb8..e359d529 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -235,18 +235,21 @@ python do_rootfs_install() { progress_reporter = bb.progress.MultiStageProgressReporter(d, stage_weights) - for cmd in cmds: - progress_reporter.next_stage() + try: + for cmd in cmds: + progress_reporter.next_stage() - if (d.getVarFlag(cmd, 'isar-apt-lock') or "") == "acquire-before": - lock = bb.utils.lockfile(d.getVar("REPO_ISAR_DIR") + "/isar.lock", - shared=True) + if (d.getVarFlag(cmd, 'isar-apt-lock') or "") == "acquire-before": + lock = bb.utils.lockfile(d.getVar("REPO_ISAR_DIR") + "/isar.lock", + shared=True) - bb.build.exec_func(cmd, d) + bb.build.exec_func(cmd, d) - if (d.getVarFlag(cmd, 'isar-apt-lock') or "") == "release-after": - bb.utils.unlockfile(lock) - progress_reporter.finish() + if (d.getVarFlag(cmd, 'isar-apt-lock') or "") == "release-after": + bb.utils.unlockfile(lock) + progress_reporter.finish() + finally: + bb.build.exec_func('rootfs_do_umounts', d) } addtask rootfs_install before do_rootfs_postprocess after do_unpack @@ -366,9 +369,13 @@ python do_rootfs_postprocess() { if cmds is None or not cmds.strip(): return cmds = cmds.split() - for i, cmd in enumerate(cmds): - bb.build.exec_func(cmd, d) - progress_reporter.update(int(i / len(cmds) * 100)) + + try: + for i, cmd in enumerate(cmds): + bb.build.exec_func(cmd, d) + progress_reporter.update(int(i / len(cmds) * 100)) + finally: + bb.build.exec_func('rootfs_do_umounts', d) } addtask rootfs_postprocess before do_rootfs after do_unpack -- 2.39.5 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20241002203156.149572-2-florian.bezdeka%40siemens.com.