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; Tue, 01 Oct 2024 17:14:12 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pg1-f187.google.com (mail-pg1-f187.google.com [209.85.215.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 491FEAUV014066 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 1 Oct 2024 17:14:11 +0200 Received: by mail-pg1-f187.google.com with SMTP id 41be03b00d2f7-7b696999c65sf3717634a12.3 for ; Tue, 01 Oct 2024 08:14:11 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1727795644; cv=pass; d=google.com; s=arc-20240605; b=JSt8KDZEkvbp4wB8UwSpfbBA2rcdZddzyhwTQnjDGV/oDBYMLQDdIb4lyxWKDTqci+ 6dWi0aB1VOQo1BD7Crwid8e5LEKHoVJ9aHbA2dDVcHEaErmbuufH9crB6Ccf+om+yGw4 VLoyYQ9rf+4zBbDTnzs1M9GSgUVHUwFnTUjRiyuCcFb3Xqas6IMmFsYuo9PhJwrmmX4T W1eK+BYiZBRcQtIBkgvlRnykhZg5GIXAB7G0ZoMY/yJMyx1En6aU0q9r/sPTzxZAvfuI aqWSFRwVwcL7HK5JTyUm0hdYgBeWByq5DzDbh0Jea/oPe0ia4x8QwcV4ZyBAxVolljZo IgpA== 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=aRKkaUsVXvNBsotZzZ9xZzaCcPhnoG3zbXMppIjWQzA=; fh=k0bNVrX7p04aQfu1sqaa74n3byTr665r80YW5zcQ8Fc=; b=IOaQ5qSPe0acP02nl2SFtvRbTWqH0FfBJAeywnBcEgBydoVRXX8XUS6gjXhxn7f83N SRudZXdn57Dk6668/LFXue9qd/b8hNvMC9YIKYtVsV5F2Zvz6q6I/5FR9KLLGjJSRJQw GLwAaWMwbPYDH68yQBN7JgPpWn15XGoQvCSW+Pp8AGDZtZg9nwzTO0AHSYzeSkJwX7yn U/KlMOYooWQFZu7c3S+JZ5yLerTNlnqu+BJZacoDxTS49z/aHJ/UhsciAEEWxQNshkl3 EVq4Xl5/3JbfZS0NwUQhc/OVVdX8n0zAR0HEFMaPT67ytjM9c+eS+Dsxksd4ypg5UTCI yCrg==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=AtXqWcP1; spf=pass (google.com: domain of fm-294854-2024100115140049dae0ce783bd6a314-_pugcn@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-2024100115140049dae0ce783bd6a314-_pUgCn@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=1727795644; x=1728400444; 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=aRKkaUsVXvNBsotZzZ9xZzaCcPhnoG3zbXMppIjWQzA=; b=rMmaZawSNL8emJuYnZa4FZWrGsxHPB1oreSRMypQ+OdpHihfjHncC3vlCKVRn7CeyA uVDA/DNbiEcvabZMMy18mXH9sQR6f7hpWHT0cSgaYmmeo11mxMvEOn5lxGj7cqvj9Nw7 pW9PFAnS2HsiN/K4TxYpL61UqJFWaG+ywXW/u8OVQZw/ZvMTnKtWSZG6KSsKwrX+odgc B6SPLNblAWiki69ZExRtfR1T2rvxjcfqLzVX9W6BK+lsusY+J5jSfv8lFN6sxhdSg5NG Q+OhE35yJslmyc8++eYuCg4UEklzMxcdZ0D7Ei6PD1u/mVPdHkLsWAI/+MNwn3f53dOf VATg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727795644; x=1728400444; 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=aRKkaUsVXvNBsotZzZ9xZzaCcPhnoG3zbXMppIjWQzA=; b=mb11q/gaNnD4rvgCQn2gPz0DQb2CWfkjcwoyEg5MHWuJrRkAYD2+6m1vnVhKWx7qj8 OJb6Ae5MeBkqdwrL/X3ddJdR/e4weBjvFTrP8EeGtkOLCvywuY/tcUVf97LmgRNC+m+l IGzDvRQOu4BPTuwkaS6opiNuocdVSEjWGbjaZhnCEb7WVJlBQNHZejNH+07OYP7rHcdH eG1tXi/X2S4F2PBZFlBbyvZ71v2WOzwGggTyJg6NJAVG03rDMt6zKZhIrJYJAD8Qg6OU C0wK8Y/1NCHXBOhwLwOyE5zgETBK7EzxqHDjYw3MEGCbV+I6Lh/YwtumZ56CAvdpkC8C 5/hw== X-Forwarded-Encrypted: i=2; AJvYcCVYsxmF5bpD4VSPALKIQi3393cjfw+utb97pos3nSNeixkjtrQ62PAsRtcSX5b0FiwAwMxL@ilbers.de X-Gm-Message-State: AOJu0YwrD9+66akfzZkUNujhOBpq6dkb0jFOGSCz0rqzli4RoBwx5Jho GJfEfTbd9WeAygTpqJXa5yShUGdvRxU5jzWXkgYlHKShj3jeAJZr X-Google-Smtp-Source: AGHT+IF/Pe/MpnNkFIF5fjoVmjfHJW4Adv7zXj1zxeDsI5jLD5t1BF33DHefXJd495djJidlL3zXDg== X-Received: by 2002:a17:90a:62c3:b0:2c9:6cd2:1732 with SMTP id 98e67ed59e1d1-2e182cad975mr86587a91.0.1727795644217; Tue, 01 Oct 2024 08:14:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90b:ecc:b0:2da:7722:3e2 with SMTP id 98e67ed59e1d1-2e090d40c27ls2739212a91.1.-pod-prod-07-us; Tue, 01 Oct 2024 08:14:03 -0700 (PDT) X-Received: by 2002:a17:90a:88d:b0:2da:9490:900c with SMTP id 98e67ed59e1d1-2e1846aff5bmr36866a91.21.1727795642622; Tue, 01 Oct 2024 08:14:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727795642; cv=none; d=google.com; s=arc-20240605; b=To9mC8I9UpsFuwZgB6BSGp+jKMWUY84nEOYJNb+FgNVS7D4m6lJ1Ow0sEEj4cDM5pV QchYhfkKy2DljlmtHekv4vNQBmEcqZCS3s5mDqiSdEkxTSqQsxLnbb0HfdfqVSlgkQNq Ny9onbeEyK6L9f2wYxieG7S9NpaQsbW9wWLXAhl9a174S8j4Y3mNks3eny9ThqL/ZvH/ tX/cuucqKUDSoyhcBpOUD9o14LUpDSx/rdqmurgpGtx6/vtW6MHRpQzkdzu9hziTWxOk HyrdLYbLtndaaiV+0d0rbG/k/wRgQCa6s7hLR6/zDzdgNcIUXnfNDIs/XdibShUrq7g5 cAUw== 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=L+aiyg+Vkq2cXPD5BGZvb9NyrKygouJJWb+h7oqhrEo=; fh=gjNsleUMU++pCCGGHOTELE3rzItC14u9gn4+F3xKmnc=; b=kzE8jdKRoMqsteB9rWoi1I1XJ0zpxfCgyxfSKMFcEFZSdp5fYiMWpwjSTCDBMNBbKS qTmObyW4TV0YwlVLnBQIBs0s3v9lefTcyPjl6VSjw45Af0+DKxcvb7Bh46FFUm/LDkb1 Nm2O+gbEzmFs3dCgfut/dG6lO1P2KcTJk4+Nsezf3olZJ1+qpCti6nx5S09uvQoiEbXT riq7wHz+ei5yWrWSFCrRAFU+cYoBmTk7faGo2y3G4qETcvIgDsTqtUGZtXhC2rXrSgIF ac+KX1DWE2UDunLfMx90VoZgZqYq0jcUHGqo5bbtKDMqpTzQZWLncwe5GYGmJ7fcbOH7 ZKOA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=AtXqWcP1; spf=pass (google.com: domain of fm-294854-2024100115140049dae0ce783bd6a314-_pugcn@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-2024100115140049dae0ce783bd6a314-_pUgCn@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 98e67ed59e1d1-2e18258f2b7si11952a91.0.2024.10.01.08.14.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Oct 2024 08:14:02 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-2024100115140049dae0ce783bd6a314-_pugcn@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 2024100115140049dae0ce783bd6a314 for ; Tue, 01 Oct 2024 17:14:00 +0200 From: "'Jan Kiszka' via isar-users" To: isar-users Cc: Florian Bezdeka Subject: [PATCH v2 1/3] image: Avoid breaking the build when mounts are no longer present on umount Date: Tue, 1 Oct 2024 17:13:57 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=AtXqWcP1; spf=pass (google.com: domain of fm-294854-2024100115140049dae0ce783bd6a314-_pugcn@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-2024100115140049dae0ce783bd6a314-_pUgCn@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka 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_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-TUID: HmlgmGjjDrRe From: Jan Kiszka This does not seem to trigger yet because we always have those mountpoints present. But if that is no longer the case, we will bail out when mountpoint fails due to the set -e. Fixes: 165519a7b314 ("sudo: Fail on the first error") Signed-off-by: Jan Kiszka --- meta/classes/image.bbclass | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index c29d9e26..ef25df49 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -406,24 +406,31 @@ do_rootfs_finalize() { -maxdepth 1 -name 'qemu-*-static' -type f -delete fi - mountpoint -q '${ROOTFSDIR}/isar-apt' && \ - umount '${ROOTFSDIR}/isar-apt' && \ + if mountpoint -q '${ROOTFSDIR}/isar-apt'; then + umount '${ROOTFSDIR}/isar-apt' rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/isar-apt + fi - mountpoint -q '${ROOTFSDIR}/base-apt' && \ - umount '${ROOTFSDIR}/base-apt' && \ + if mountpoint -q '${ROOTFSDIR}/base-apt'; then + umount '${ROOTFSDIR}/base-apt' rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/base-apt + fi - mountpoint -q '${ROOTFSDIR}/dev/pts' && \ + if mountpoint -q '${ROOTFSDIR}/dev/pts'; then umount '${ROOTFSDIR}/dev/pts' - mountpoint -q '${ROOTFSDIR}/dev/shm' && \ + fi + if mountpoint -q '${ROOTFSDIR}/dev/shm'; then umount '${ROOTFSDIR}/dev/shm' - mountpoint -q '${ROOTFSDIR}/dev' && \ + fi + if mountpoint -q '${ROOTFSDIR}/dev'; then umount '${ROOTFSDIR}/dev' - mountpoint -q '${ROOTFSDIR}/proc' && \ + fi + if mountpoint -q '${ROOTFSDIR}/proc'; then umount '${ROOTFSDIR}/proc' - mountpoint -q '${ROOTFSDIR}/sys' && \ + fi + if mountpoint -q '${ROOTFSDIR}/sys'; then umount '${ROOTFSDIR}/sys' + fi if [ -e "${ROOTFSDIR}/etc/apt/sources-list" ]; then mv "${ROOTFSDIR}/etc/apt/sources-list" \ -- 2.43.0 -- 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/c84a1a48568e0204b0eb36fedb8af4a2809f199a.1727795639.git.jan.kiszka%40siemens.com.