From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6982225001537601536 X-Received: by 2002:a17:907:101a:: with SMTP id ox26mr20286381ejb.286.1625746635684; Thu, 08 Jul 2021 05:17:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:90b:: with SMTP id g11ls769396edz.2.gmail; Thu, 08 Jul 2021 05:17:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWDf7CIbagCzCFOUVkBXOcQjQI+jfKf5vtD9QH7G+z5T3v7UkYwtjO729P5kvspLCClMGy X-Received: by 2002:aa7:dc02:: with SMTP id b2mr37364823edu.46.1625746634729; Thu, 08 Jul 2021 05:17:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625746634; cv=none; d=google.com; s=arc-20160816; b=fU2H2J54ZEYIrloDQDuw3H/FZEQk1MGhPQPOfSaKstdgoDJI26509xIygroZOUmWbV BE65Bax5QJ3PL0xqZYaG5V5miFEDR8Tt4iDMLDGwOgDoaaWc5NMPwA12zLDuB9cBpJKl HYmP2X6jd/rqNFJxaoiAW2+yvxU+alUqsa7L1PYSz1KLvZrX5UY5jM/0DK2imuBlG8Dh OzmjWK8m/vnBtdmY64BS5POifwJhgd89w/POOFiWYydYqJwatqn4c30NsjVgI+cL7xxN 94KcY/v+KziZg6uBe6fK416mhSl8snhtt2tIOy45priGumZ34PlzfQiCD8VGdTfKjmgA Mc4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=U1FBDhw48nmghf/rbqSNnJ910xdIZLMTszls7PJT6l4=; b=FlzS8BYJ+6IKwQ8Nou4IFGESUyh0Q8n7bMTJUl1IPZSX33QTMDc6WGLDprlLFhTx5t /KEbhgMXx0NugLgolcyG2KMmaaVN/fe94zC4Emz27T1F++WUqJ+Anc2BYwdB57zWtLin WJPFDWKmSQVhNu2gxeBMFBMmrNJsZTpG8H6qKjGZ69OaKTJLcr7VFY3tAB2F6+5l6Qt5 MAXnQx3BoBaODiAkt3We6jmixazDlfDLhuiz2BqWqtewiECAevr1FXVAGdsp+u/HgGZ2 SxObon6mz7jhIjtvghNP3VUqwe31t7rGXm7unfi9YJ3U0wZKwF33IxUpCXbMGWa443M8 EZLA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id h22si96145edr.2.2021.07.08.05.17.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Jul 2021 05:17:14 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 168CHEal011646 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 8 Jul 2021 14:17:14 +0200 Received: from [167.87.42.31] ([167.87.42.31]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 168CHDdm011575; Thu, 8 Jul 2021 14:17:14 +0200 Subject: Re: [PATCH v1 2/5] mount: Allow calling unmount on not mounted paths To: Anton Mikanovich , isar-users@googlegroups.com References: <20210707163851.204296-1-amikan@ilbers.de> <20210707163851.204296-3-amikan@ilbers.de> From: Jan Kiszka Message-ID: <62670c5b-00d6-efd0-7f85-073dd65ae34a@siemens.com> Date: Thu, 8 Jul 2021 14:17:13 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210707163851.204296-3-amikan@ilbers.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: gCU1AjhqA6b1 On 07.07.21 18:38, Anton Mikanovich wrote: > Make buildchroot_undo_mounts and rootfs_undo_mounts functions do not > fail if calling without buildchroot_do_mounts and rootfs_do_mounts. > "Why" is missing, you only have the "what" here. Jan > Signed-off-by: Anton Mikanovich > --- > meta/classes/buildchroot.bbclass | 20 ++++++++++---------- > meta/classes/rootfs.bbclass | 20 ++++++++++---------- > 2 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass > index 806a29f..9c27711 100644 > --- a/meta/classes/buildchroot.bbclass > +++ b/meta/classes/buildchroot.bbclass > @@ -23,16 +23,18 @@ python __anonymous() { > > MOUNT_LOCKFILE = "${BUILDCHROOT_DIR}.lock" > > +BUILDCHROOT_MOUNT_CNT = "${BUILDCHROOT_DIR}.mount" > + > buildchroot_do_mounts() { > sudo -s <<'EOSUDO' > ( flock 9 > set -e > > count="1" > - if [ -f '${BUILDCHROOT_DIR}.mount' ]; then > - count=$(($(cat '${BUILDCHROOT_DIR}.mount') + 1)) > + if [ -f "${BUILDCHROOT_MOUNT_CNT}" ]; then > + count=$(($(cat "${BUILDCHROOT_MOUNT_CNT}") + 1)) > fi > - echo $count > '${BUILDCHROOT_DIR}.mount' > + echo $count > "${BUILDCHROOT_MOUNT_CNT}" > if [ $count -gt 1 ]; then > exit 0 > fi > @@ -77,17 +79,15 @@ buildchroot_undo_mounts() { > ( flock 9 > set -e > > - if [ -f '${BUILDCHROOT_DIR}.mount' ]; then > - count=$(($(cat '${BUILDCHROOT_DIR}.mount') - 1)) > - echo $count > '${BUILDCHROOT_DIR}.mount' > - else > - echo "Could not find mount counter" > - exit 1 > + count="0" > + if [ -f "${BUILDCHROOT_MOUNT_CNT}" ]; then > + count=$(($(cat "${BUILDCHROOT_MOUNT_CNT}") - 1)) > + echo $count > "${BUILDCHROOT_MOUNT_CNT}" > fi > if [ $count -gt 0 ]; then > exit 0 > fi > - rm ${BUILDCHROOT_DIR}.mount > + rm -f "${BUILDCHROOT_MOUNT_CNT}" > > mountpoint -q '${BUILDCHROOT_DIR}/base-apt' && \ > umount ${BUILDCHROOT_DIR}/base-apt && \ > diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass > index 50d6408..9ccc8e3 100644 > --- a/meta/classes/rootfs.bbclass > +++ b/meta/classes/rootfs.bbclass > @@ -28,6 +28,8 @@ export LC_ALL = "C" > > MOUNT_LOCKFILE = "${ROOTFSDIR}.lock" > > +ROOTFS_MOUNT_CNT = "${ROOTFSDIR}.mount" > + > rootfs_do_mounts[weight] = "3" > rootfs_do_mounts() { > sudo -s <<'EOSUDO' > @@ -35,10 +37,10 @@ rootfs_do_mounts() { > set -e > > count="1" > - if [ -f '${ROOTFSDIR}.mount' ]; then > - count=$(($(cat '${ROOTFSDIR}.mount') + 1)) > + if [ -f "${ROOTFS_MOUNT_CNT}" ]; then > + count=$(($(cat "${ROOTFS_MOUNT_CNT}") + 1)) > fi > - echo $count > '${ROOTFSDIR}.mount' > + echo $count > "${ROOTFS_MOUNT_CNT}" > if [ $count -gt 1 ]; then > exit 0 > fi > @@ -79,17 +81,15 @@ rootfs_undo_mounts() { > ( flock 9 > set -e > > - if [ -f '${ROOTFSDIR}.mount' ]; then > - count=$(($(cat '${ROOTFSDIR}.mount') - 1)) > - echo $count > '${ROOTFSDIR}.mount' > - else > - echo "Could not find mount counter" > - exit 1 > + count="0" > + if [ -f "${ROOTFS_MOUNT_CNT}" ]; then > + count=$(($(cat "${ROOTFS_MOUNT_CNT}") - 1)) > + echo $count > "${ROOTFS_MOUNT_CNT}" > fi > if [ $count -gt 0 ]; then > exit 0 > fi > - rm ${ROOTFSDIR}.mount > + rm -f "${ROOTFS_MOUNT_CNT}" > > mountpoint -q '${ROOTFSDIR}/base-apt' && \ > umount ${ROOTFSDIR}/base-apt && \ > -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux