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; Fri, 11 Oct 2024 12:01:15 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-oi1-f184.google.com (mail-oi1-f184.google.com [209.85.167.184]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 49BA1DPd008779 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 11 Oct 2024 12:01:14 +0200 Received: by mail-oi1-f184.google.com with SMTP id 5614622812f47-3e5c89f9bd1sf585660b6e.3 for ; Fri, 11 Oct 2024 03:01:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1728640867; cv=pass; d=google.com; s=arc-20240605; b=VwXO6PMSdDzwCOCKPchE38Ogs3dSkWSYiGm7FvS9y5Dub5JDQ6kZ+H7ZpkRCAbDjTf FvfGUa4nwnHJn6v23lHhzDQtqLyxb/YcEJpTEi7WCddYHNRo8HGJ8padQsGtPQ5QSghv yMXovSeWvw9icKdoDh2R7tQtThe9KlpVpPb35DMbmOw2TW0iiDZO4MR5KTX7/FrxFwY5 /3vkEqsUdvnad5IDTiw3zGZ+ws2s7rxQTuNBgJ2+d9Nx7cHskdySLSySKwTX4XGYQPMc g2KyOnug+eR7+dcBHD9qll+ieFnfAUeo1gG4/bkCdjqXU48xpjykBVU1TLz8L8fGtf7Y Aw4A== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=7grNpAoxAN2YLhzE1f0rdnLvLJ8te4vvQL6gV5/wIPk=; fh=2PSaU7WjkoNbma1kBuPoPy0Z/M4fmXk2lcnfb/OueEc=; b=QR33bnGDSOQI/Vwkg7yhs2NBXpz3U3X/uVySWW20c6WFG8g2sJlorxitIeigX3wRWj 82eKZhA18JYZrJBsfVwblKHMSs5sTLjZjdR4Fg6XxLphQ5pM4LuUuhF4g1KzlpMm600T N/L/txHGD2Gt5LMVTkvXj7s1hnW1ansVPVcaKBNqA7Td4s/OtH08ky6Vh/Zlxl+il05N wTHb3wURcwQVh2kpKsr9okTkdzzSScfZZFTF5ICSwj+ZzAVz4wRpL93bkFGjaxIg/Mp8 OOjElB3fgrMVihZ9UXlCBSK5U48pZrxpKA8rbDdGJ7cW50op5qvPN1DQk+U0bjnIrXcA OX+g==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1728640867; x=1729245667; darn=ilbers.de; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=7grNpAoxAN2YLhzE1f0rdnLvLJ8te4vvQL6gV5/wIPk=; b=LWE6kztk3Re3ovv1x8FrRnk2RPq8NE4hnUg1dJM/Wt7pj/ZBDt7rcqhCd8XQ+5SCLL Y1g69CApHbreqlcqlYiCNa/TuDt83q/yMpqDZlHi9E3dKL/BuDFpODpmZTyZV0ddW2sI bsc9atn7Vsxj9FR+8wroivsIVUug4rToUtZIo5BoyJufkl/xcSxz4owsjLYb1WWZyMqD NdnVtU1Yfk1oO9hXpgnJH3wv3Vnf0CRp1yLlA0VhZc1OfpMpHMI2nxxeEOuhx7VsjyWJ RGscWHUUUhOVlh/qESMLqPMksExqqREnflIBLPtAMaIm+sGbVm5aJqnL+NloTojC7BSL qWug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728640867; x=1729245667; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :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:sender:from:to:cc:subject:date :message-id:reply-to; bh=7grNpAoxAN2YLhzE1f0rdnLvLJ8te4vvQL6gV5/wIPk=; b=XDNUcGjKzPxi0xOHv/rkqcYLwQmUaRbVomOZT09PF9uhKTSAtgPHnH0V9odwyDAh/4 Gaa+P1f5EhwYVRCStbPb9sNLu0WVF2EI7luZDO/4TEk37WDAM1f5AlKvFPc50a+Lxvrm Gg1AOweti2e20/xm0+aBv9rtKji1PTJwCcVmZaolca2ilIHSUp8fdmqUsOTVBiMM30qu KzTmjyUCl9wa2DMFm5ubAbI6osW6yiZKqpdtDUMPrHi4466qO/fJBu2fMSMbHdAy3mfG i/R2CLxd0gx7sw31tu0KYLVqwwVTDaAjYnVYpX4GfIWd/vMGI9mPPo4SJh1Yg4+fW96y WK5Q== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVRJKUrVv0kQ8aopaW2KGSOA8X2ZR7a7aIBd0/r67ZpW43739VAyOeQj8C8X6jDoeidtHI4@ilbers.de X-Gm-Message-State: AOJu0YwuraSn0Bauhv0nG9is230VvKS9YbYRVWrJN0pai31MZQgqdO6v NHMcQA2R8zP15hRr6lL9fdVj2OZ9WrCd5VAlU5mMQbdHAPJOyL86 X-Google-Smtp-Source: AGHT+IGNaFkOpx95TlV0vCmkO9DXYWiNK1yr4rv98bladNdikQx71vaKcORxljlGgDV3/MwxSE7z+A== X-Received: by 2002:a05:6830:258c:b0:717:d48c:593 with SMTP id 46e09a7af769-717d6445b16mr1168536a34.10.1728640866416; Fri, 11 Oct 2024 03:01:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a4a:e38c:0:b0:5e7:af90:76b5 with SMTP id 006d021491bc7-5e990b1ffa1ls732249eaf.0.-pod-prod-07-us; Fri, 11 Oct 2024 03:01:05 -0700 (PDT) X-Received: by 2002:a05:6830:915:b0:717:d601:eb43 with SMTP id 46e09a7af769-717d64fe404mr1033474a34.26.1728640865274; Fri, 11 Oct 2024 03:01:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728640865; cv=none; d=google.com; s=arc-20240605; b=FH8Gv549tL2wgOjgo2SKcy4QDCexJpU3ibl8KMUP6ZugIZdA8XAXgI3qeXhYUHOWyG z9iZjIH+8hs1FD31UniR0rMuhrfPewdtmvYG6wwEvgr9Q25rhKfa67G8QnGMcoJ952oY iovj4JPZt9IgNK+4wSfx4xmNw5sY6EjO7IwBq6N5FwYFx6Q0RijyEqfHP/hWCJwuPVRJ 2/3Y4CkRXVel6eKkFc7IQXk1+2gHTJ7D3M32qZXKVZ70Rm77EmcITknPBDvf1i85HMdp fGtg7OQP21eFJo0WIzxUTjMx1jskb3p/RLXMihBiuzAQOZO+WRJWg+XyqxbhZ7EHVa+c 54IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=+j9WCd7MUU3bwwJzOPz6IhzlPzKTOE5scvISNzGkx9g=; fh=ayfAe8qmvuhnFlecYJaCAyE02arlonJgV2H/zKorYgo=; b=Q4W1T5QYWDkPqeW1Dh4fVG3PHeRTBss84xVDbEiyghPAxmEwUFeVqP6HKb7pB5XMUG mChq7aCQLoQQaWfHwoUunyDjqXlorSp94iScEQ63FYEs5GvC7XVYn+FgFsWB2KLot4vR Ev0ItjgwtZNY7icGSdEeFHqV0nM+lPvkMtnoMNbYAlFSvfMUjubNi53QOWHUuC1UQqtx ZwdnI04MIm6jJSx69UMDsIjtpt84WvdDmJU9ITS1ivNOyqa6ugGB9Z0pdv6W91sl6HDo mgBJypVBSzOwJ5vg1oCZBrpECAsSpyZIx3hiKFsvjeJwLN5l1CsEVzzn/fUTm1VtuGn/ yTfQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 46e09a7af769-717cfed0e73si132856a34.1.2024.10.11.03.01.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Oct 2024 03:01:04 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.114]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 49BA0vWM008632 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 11 Oct 2024 12:01:02 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Jan Kiszka Subject: [PATCH v3 5/8] rootfs: Provide rootfs_do_umounts Date: Fri, 11 Oct 2024 13:00:47 +0300 Message-Id: <20241011100050.322686-6-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241011100050.322686-1-amikan@ilbers.de> References: <20241011100050.322686-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, 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-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de 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-TUID: 7St2aGk/Qws8 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 9d5b782a..1eb974e8 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -405,6 +405,8 @@ def apt_list_files(d): IMAGE_LISTS = "${@ ' '.join(apt_list_files(d)) }" do_rootfs_finalize() { + rootfs_do_umounts + sudo -s <<'EOSUDO' set -e @@ -418,32 +420,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.34.1 -- 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/20241011100050.322686-6-amikan%40ilbers.de.