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-pj1-f56.google.com (mail-pj1-f56.google.com [209.85.216.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 491FEBtC014072 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 1 Oct 2024 17:14:12 +0200 Received: by mail-pj1-f56.google.com with SMTP id 98e67ed59e1d1-2e1048bd88csf3918721a91.0 for ; Tue, 01 Oct 2024 08:14:12 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1727795645; cv=pass; d=google.com; s=arc-20240605; b=Laoj2qrBp0tTeZ/tPD9l6Kw5pgRfleAsSi3mQ4bKqmn/TU6ThZEP4cwr0T7gKUXoL2 2jbpF/gPUfc7OYuAIr9lc459t37Xa764gjC13vS3AcEzdlKKtcUh1ONr4QC2PW43sks2 9Rls5996n6A4vU3PGwFf52qbCwQlUDlNrJ6smlClxTEC9/XZw0rHG72IB8XyND9xP3Au 1jJwQppqkg/imNRrKxaP9vRTTxHhnukJ/L4JPLRTZjOW2iXhEOVQKPB9bwTBcxTbCkLT FI5e8E1RGWfKw80SHCQKjvMtk8PpOUoKot3hnd4hbGAJb30VkLBMuOGEYcSsv7c6l/pO pxFQ== 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=HbDREeWSGj7oSvuhLhn0N6upudDIbGNyjEiVWn+4ugc=; fh=kyfnXacdSVV5fxRIhcl60AdF9TY3eaMJK0xThpWuyNM=; b=O4ohr1igzuzyFUegdkN/rdc6bBQdk7GjAISH9CKUTpAhqD71azCa03iXr5wAggaWBp znAC7SkDqx5NkpdrNRVTsjoBTG3ujC1EV8QkNQyI90SPQaHfeeyQQ6T/iWFCiWCGuqiI agKvklJzP9sGkibNWqiR5Lz2HQLXJCvF5uo00G91M9CLpdkzVRF7i1wM2HAdcSknrqN2 8sO5gIoeMPt2ORcJseRP0tgGMVeKMOwFHz7CE5M/eP0lu4yYgi9qErs4z+nPBPR54lu/ lUQfwu/8uxbdRS2PuGMeDRGIQ4qZG06UTuDKuhDKdX6l8HSWgbJYviTmYvTgn+vcHYH6 KQ8g==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Y6LnXluv; spf=pass (google.com: domain of fm-294854-20241001151400eebc8bdafdad8ec274-6sxvlf@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-294854-20241001151400eebc8bdafdad8ec274-6sXVLf@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=1727795645; x=1728400445; 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=HbDREeWSGj7oSvuhLhn0N6upudDIbGNyjEiVWn+4ugc=; b=e5OWQbjoGxWKjkU1ir4WtZeRY9ho1NjmyEiGP5fIRjIFfd4S/0rENK3ohZT0gR/52A j5FFPNAM1Vs3ur1HHMpzDlnKpj7jaR4vuJUMhBAHz5rh/c41j2W04vGlSudNf2PbaIGN Vz3xcKJr2koJgBUJ6CL/9XJHBS1vUJ8zF9Hzb1TolVtQnD+0wOu6qhD7Y3QOz5zDj0Fu EUV5JiPROD6ieXNBi6v7xnZarnZAZ4mYh4OoGPRDb/RnR/cYNUjjtaUnTzXSkGiHeh2G Gt0BpR9/w9aQ7HM7pz5zX+IhVCWTP5YGL7mT6F0kJUVcwBQrPGL8fQY2pLiGbAPYKOrx i3KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727795645; x=1728400445; 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=HbDREeWSGj7oSvuhLhn0N6upudDIbGNyjEiVWn+4ugc=; b=sW8+JZ72b7Kz0BvnUckqJG41vG2Khho/tUksyzn5KjHMMhNc3eXmuVU74WxkT2oXoh 16NLddn/WhZbgX8YHlndBFF+MxEVZamvD9dlckWBlZNxU2LcOlq1prJK0nyMHKNFQC7t zl3Hn5poMOnrISfdUJLbj/IfW8IstnQK1OfNujov5BbWT8+ELO0ojBt9uJxMR/CZ6OK+ JCE3SDDDK2j9RfYDnsrGQmGpKKYK9EC2CLUvTy2egV0Q4jFRZzFby89OwZ+T+9B3+lgI GqaT0vfnJ9LZHVD9HrRieBnv1Xk/oD0f9swZ3YxUWLmlFPg5KieKy+kKB9PyMro1MmWl 4RLQ== X-Forwarded-Encrypted: i=2; AJvYcCU6ljjKYgb2iQgDzDysdorh2GgYaddUKzdEdfqDp5vlpIJXcvPu7ZjBG3OiK+lKJiw+qdUj@ilbers.de X-Gm-Message-State: AOJu0YwPpwnGbvCwH8XnmMVLrUBov0RvxdZmSe/KgLq6M/U8QXQWvD+5 yX6mocr39XtR8T3Ec+O80hlM2YmSSvQXX85z5cfoCnMfENUAl3hZ X-Google-Smtp-Source: AGHT+IEBm7Q6/Hoy3LzRE/hRgx6l6EYAMXkOW33OdyhDdX4LfrnoIEapxOhivYXO+HvfVemiENwEKA== X-Received: by 2002:a17:90b:1c87:b0:2d8:8d34:5b8 with SMTP id 98e67ed59e1d1-2e18469315amr40665a91.10.1727795644847; Tue, 01 Oct 2024 08:14:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:de94:b0:2cb:4a85:9588 with SMTP id 98e67ed59e1d1-2e0909d1cc3ls3435327a91.1.-pod-prod-03-us; Tue, 01 Oct 2024 08:14:03 -0700 (PDT) X-Received: by 2002:a17:90a:d814:b0:2da:8e9b:f37b with SMTP id 98e67ed59e1d1-2e184814f7bmr30165a91.24.1727795642746; 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=lfRCNeLdr9Fls4dQV0chRkfdZ6LyLY1lzDGhOHlBa5zfHPHDQOYOKGPVFmH+xFL5+9 aiYjx+lzHF/7MmyM9Z9ISQwd2qZBF5WceWiAyTwQConRl8uAqLyaL+zUYXRJaYVocFMm YsOicmUTxpMkx0FAmfJ1nygbAATM/kpfl7FxYMJwtw1A7CbAyKT7rPikzpuA12nga9MA 5QEkDLJq009CeEG7FXz87LPF0Y1tlURKY3CTCZ86B1zMF9LzmXQIzBqVL7BUONeDFfhN KlKnTgT7+79M/4bs4cbLwBDhDznMqeFAbXf3qB9MCt6UhTy/sfbjwrRkDtqGBmpK9WXt 6zgg== 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=KRXGOByZsAUou3GMTqBRF3bIWkykNaMS+P+QePQa3CA=; fh=gjNsleUMU++pCCGGHOTELE3rzItC14u9gn4+F3xKmnc=; b=jiqyGUZs/Gkgtdes19STE6HLcy09+AyYmu6xQqj7u5lj1nTfIaW6pjKI9F/Tlei3R1 FN6fs8SArykavDcXbpsFN5EJU1fpk87kXLy2s5+/Bcmfl6O3ks//+5YaHT8qpWw3JLbu V3YYyCaa6kfwsNo003xRwzLy49IBQSZSiKtnPof4kYHjxJmv+8KSRwueLUB7TFs2ugeD OhQr0R+EaQO2a2XOZNOtbvkjJFD1egPGn3zjXk5DuRzSJSGNq+z6vWd8W0myqii5booD Ayuc+76IjCmWU3KRfKT6/GwAX7MWGk9oGfgjvotIa8awKac7ocS6KZs7c9QF/ehPukVJ VaUw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=Y6LnXluv; spf=pass (google.com: domain of fm-294854-20241001151400eebc8bdafdad8ec274-6sxvlf@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-294854-20241001151400eebc8bdafdad8ec274-6sXVLf@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id 98e67ed59e1d1-2e1829cc7a3si4821a91.1.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-20241001151400eebc8bdafdad8ec274-6sxvlf@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20241001151400eebc8bdafdad8ec274 for ; Tue, 01 Oct 2024 17:14:00 +0200 From: "'Jan Kiszka' via isar-users" To: isar-users Cc: Florian Bezdeka Subject: [PATCH v2 2/3] rootfs: Provide rootfs_do_umounts Date: Tue, 1 Oct 2024 17:13:58 +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=Y6LnXluv; spf=pass (google.com: domain of fm-294854-20241001151400eebc8bdafdad8ec274-6sxvlf@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-294854-20241001151400eebc8bdafdad8ec274-6sXVLf@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: OLXizn4X0+ZU From: Jan Kiszka This will be used more frequently soon to avoid dangling mounts. Signed-off-by: Jan Kiszka --- meta/classes/image.bbclass | 28 ++-------------------------- meta/classes/rootfs.bbclass | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ef25df49..1414a3ee 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -393,6 +393,8 @@ python do_deploy() { addtask deploy before do_build after do_image do_rootfs_finalize() { + rootfs_do_umounts + sudo -s <<'EOSUDO' set -e @@ -406,32 +408,6 @@ do_rootfs_finalize() { -maxdepth 1 -name 'qemu-*-static' -type f -delete fi - if mountpoint -q '${ROOTFSDIR}/isar-apt'; then - umount '${ROOTFSDIR}/isar-apt' - rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/isar-apt - fi - - if mountpoint -q '${ROOTFSDIR}/base-apt'; then - umount '${ROOTFSDIR}/base-apt' - rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/base-apt - fi - - if mountpoint -q '${ROOTFSDIR}/dev/pts'; then - umount '${ROOTFSDIR}/dev/pts' - fi - if mountpoint -q '${ROOTFSDIR}/dev/shm'; then - umount '${ROOTFSDIR}/dev/shm' - fi - if mountpoint -q '${ROOTFSDIR}/dev'; then - umount '${ROOTFSDIR}/dev' - fi - if mountpoint -q '${ROOTFSDIR}/proc'; then - umount '${ROOTFSDIR}/proc' - 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" \ "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index f0abd795..ef40cbdf 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -65,6 +65,38 @@ rootfs_do_mounts() { EOSUDO } +rootfs_do_umounts() { + sudo -s <<'EOSUDO' + set -e + if mountpoint -q '${ROOTFSDIR}/isar-apt'; then + umount '${ROOTFSDIR}/isar-apt' + rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/isar-apt + fi + + if mountpoint -q '${ROOTFSDIR}/base-apt'; then + umount '${ROOTFSDIR}/base-apt' + rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/base-apt + fi + + if mountpoint -q '${ROOTFSDIR}/dev/pts'; then + umount '${ROOTFSDIR}/dev/pts' + fi + if mountpoint -q '${ROOTFSDIR}/dev/shm'; then + umount '${ROOTFSDIR}/dev/shm' + fi + if mountpoint -q '${ROOTFSDIR}/dev'; then + umount '${ROOTFSDIR}/dev' + fi + if mountpoint -q '${ROOTFSDIR}/proc'; then + umount '${ROOTFSDIR}/proc' + fi + if mountpoint -q '${ROOTFSDIR}/sys'; then + umount '${ROOTFSDIR}/sys' + fi + +EOSUDO +} + rootfs_do_qemu() { if [ '${@repr(d.getVar('ROOTFS_ARCH') == d.getVar('HOST_ARCH'))}' = 'False' ] then -- 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/c8fceb7009980251e7191709d808575ee279b499.1727795639.git.jan.kiszka%40siemens.com.