From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7010687509260664832 X-Received: by 2002:a05:6512:144:: with SMTP id m4mr23690239lfo.64.1632748464462; Mon, 27 Sep 2021 06:14:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1242:: with SMTP id h2ls3644927ljh.2.gmail; Mon, 27 Sep 2021 06:14:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmvD1EOjr5SaEe5jHN0pbZuMgFgUzsHQg1T2asVKXDGAO2xdpy01rVsLm27Vj0KD4Xikdy X-Received: by 2002:a2e:5008:: with SMTP id e8mr16594805ljb.225.1632748463426; Mon, 27 Sep 2021 06:14:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632748463; cv=none; d=google.com; s=arc-20160816; b=E8jOIw4dQn7BJPauR0735Ru1gic61DeVQiomjWGeVMTv1DedGLQXnv7khMDgSQmaKw Og+XgJes97sHHZtiRTB6Wwf9WKD75z0CCy/r3t2hbhTRqDB9Eo7GiUQgY0dpG5KCGcm1 8dPCIWNOags88/ehtb1R45cGdV28Oe8UgMXUaw9RJ0kFhfSmAYNan+sz+3sDOU2nr3bM dfPOYIP9tofT5SCVQsbigeERzbeKik29ffs0NiybRkTcrVxNcrovufsER71Bn5XwTdcS oSqr4MRv1gx74Y/Owc41+1bhht6ok/t5xxKHJJlea3Sxre/I/iY7tH+8bqLHguetdXlm GvGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=mlYTe0/pfWM0Ysj11BcZ/c89ceA/ABnEIkhWC6mO/Y0=; b=hDFRH0XlaZdu+LCENwONbAtm16Q805dsfdu36EqgM4v7aR0TiXIN3HHL7CTj7oOg7W VtU0dvNBpz1UExxLXkIAu+osS8iUGZmT/AwO611B4eMe91xwUbatIc4juG9kElQRAtg2 cU/81PpvfDOntcD0mqHUjCTDm0+4kyV+gh7lgdXotIOXhIBqnBDl32aIKW+3w38IVNhh tV9gUZjLFWoPtGN+BRLAYcpyQCSJpBkiWq4kb24FrSHM9t+fuf26RkWmIMGMDdICb9Vo Bl+GFctZawyjFn961waY4TRMIZM7KUm9ob8ko1sjK84dAf1gKEp+nAUoL5medEU4LUun xnrA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=felix.moessbauer@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 d1si801332ljq.2.2021.09.27.06.14.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Sep 2021 06:14:23 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@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 felix.moessbauer@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=felix.moessbauer@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 18RDEMTn009327 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 27 Sep 2021 15:14:22 +0200 Received: from MD1T0KAC-VM.ad001.siemens.net (md1t0kac.ad001.siemens.net [139.25.68.224]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 18RDEKwv030646; Mon, 27 Sep 2021 15:14:22 +0200 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH v3 2/3] do not unmount wic mounts to avoid over-locking Date: Mon, 27 Sep 2021 15:14:07 +0200 Message-Id: <20210927131408.1161317-3-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210927131408.1161317-1-felix.moessbauer@siemens.com> References: <20210927131408.1161317-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 7tmHMFIAsic4 This patch reworks the mounting in the do_wic_image task to ensure that mountpoints are not unmounted by a simultaneously running wic task. The mounted directories will finally be cleaned up by the unmount event handler. Signed-off-by: Felix Moessbauer --- meta/classes/wic-img.bbclass | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass index d849ad9..9df40a9 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -138,12 +138,13 @@ python check_for_wic_warnings() { do_wic_image[file-checksums] += "${WKS_FILE_CHECKSUM}" python do_wic_image() { + bb.build.exec_func("wic_do_mounts", d) bb.build.exec_func("generate_wic_image", d) bb.build.exec_func("check_for_wic_warnings", d) } addtask wic_image before do_image after do_image_tools -generate_wic_image() { +wic_do_mounts() { buildchroot_do_mounts sudo -s <<'EOSUDO' ( flock 9 @@ -155,6 +156,9 @@ generate_wic_image() { done ) 9>${MOUNT_LOCKFILE} EOSUDO +} + +generate_wic_image() { export FAKEROOTCMD=${FAKEROOTCMD} export BUILDDIR=${BUILDDIR} export MTOOLS_SKIP_CHECK=1 @@ -200,13 +204,4 @@ EOSUDO done rm -rf ${BUILDCHROOT_DIR}/${WICTMP} rm -rf ${IMAGE_ROOTFS}/../pseudo - sudo -s <<'EOSUDO' - ( flock 9 - for dir in ${BBLAYERS} ${STAGING_DIR} ${SCRIPTSDIR} ${BITBAKEDIR}; do - if mountpoint -q ${BUILDCHROOT_DIR}/$dir; then - umount ${BUILDCHROOT_DIR}/$dir - fi - done - ) 9>${MOUNT_LOCKFILE} -EOSUDO } -- 2.30.2