From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6657829413861720064 X-Received: by 2002:a2e:9a59:: with SMTP id k25-v6mr252844ljj.0.1550148629644; Thu, 14 Feb 2019 04:50:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:41d9:: with SMTP id d25ls251106lfi.11.gmail; Thu, 14 Feb 2019 04:50:29 -0800 (PST) X-Google-Smtp-Source: AHgI3IbHqyrhNUMaWhCzfe+4IaPFbtPs15vV5FkAnMxevQakcw7fMPKHN9ZZ1XGgv/Anfhim487u X-Received: by 2002:a19:a411:: with SMTP id q17mr233455lfc.14.1550148629035; Thu, 14 Feb 2019 04:50:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550148629; cv=none; d=google.com; s=arc-20160816; b=GjTFmwVtueSD3r73DbdUaikQklOiMa6LdL9QqpHZmmmV5Sgt+UpZ/IfuVF9QnF3pEg qOoz7yejobTOlvEWFGYo3FaQIy0wpkNksztT+5WY4syZ/a8kFjvbuhOw9Sn7qVb3DZvy inW1JcTqeYA5B0wD0BfSWf5VVXFigouUtzcv5w4QQPXvbmZEIGy46n7MZhgq9QyRuesx UOKrACyjFohIgd2EuHhJo1J/C7hevj10Rd4WO967ioejzQPJmtR9qqLbLv0djl1r3uBt nrEM6P/LrPDi/u17BQyPLWsFVyCJZwrG8yQXjo8JrscJFGL4ZSsF2rVZDyiPRL+roWh+ s3Kw== 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:references:cc:to:from:subject; bh=ORyIGNjD+xQVKKRnljSW2pQVVm35mqyB3JjTCX9illU=; b=Og8uRWWNrjRp0xjIEjRhiugjeKDhK7nWy2hSrom2orLpw2sQpgulDpWhRf1KADiMUy rY+mPUpfacvMF/AKptFa7lBKpux4P/wFsUIdJxDaJfPvAA5ci1/cLTl5pZrjbGOKGSRC QhaZC19Xt5v7V675O66LWbB3/64olnZfDIjo9X10sBYtYPF3pVnjif8i+UU9HkGQITCh kghs6/NIbDpuIe9xMD8xvp/Dp2UZpDTkojSWVli7mPUs816tZa95vuCQp+AzRP4U3bZl 0soKn5UIhvUAt0U9UMd1/P+Hw4KlU8Tb6084H2YVEmcOWLglPSOM6P/t0DuWzYgge3EJ 32JA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id s3-v6si80666ljg.5.2019.02.14.04.50.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 04:50:29 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x1ECoSph026267 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Feb 2019 13:50:28 +0100 Received: from [139.25.69.181] (linux-ses-ext02.ppmd.siemens.net [139.25.69.181]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x1ECoR13000387; Thu, 14 Feb 2019 13:50:27 +0100 Subject: Re: [PATCH] meta: refactored flock usage From: Claudius Heine To: isar-users@googlegroups.com Cc: Claudius Heine References: <20190214121819.22037-1-claudius.heine.ext@siemens.com> Message-ID: Date: Thu, 14 Feb 2019 13:50:27 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20190214121819.22037-1-claudius.heine.ext@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: LW0mVgGynM5/ On 14/02/2019 13.18, [ext] claudius.heine.ext@siemens.com wrote: > From: Claudius Heine > > Currently much care has to be taken in order to correctly escape strings > inside flock commands. And there is also on instance where this was > incorrectly used (isar-bootstrap.inc). > > The usage of flock was changed to no longer require single or double > ticks. Instead commands are run inside a subshell. Ok, there are some issues with that patch. I will investigate. > > Signed-off-by: Claudius Heine > --- > meta/classes/buildchroot.bbclass | 6 ++++-- > meta/classes/wic-img.bbclass | 6 ++++-- > meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 7 +++++-- > 3 files changed, 13 insertions(+), 6 deletions(-) > > diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass > index 0d4ff4e..0ee6ca9 100644 > --- a/meta/classes/buildchroot.bbclass > +++ b/meta/classes/buildchroot.bbclass > @@ -22,7 +22,8 @@ python __anonymous() { > MOUNT_LOCKFILE = "${BUILDCHROOT_DIR}/mount.lock" > > buildchroot_do_mounts() { > - sudo flock ${MOUNT_LOCKFILE} -c ' \ > + sudo -s < + ( flock 9 > set -e > if ! grep -q ${BUILDCHROOT_DIR}/isar-apt /proc/mounts; then > mount --bind ${REPO_ISAR_DIR}/${DISTRO} ${BUILDCHROOT_DIR}/isar-apt > @@ -36,5 +37,6 @@ buildchroot_do_mounts() { > > # Refresh /etc/resolv.conf at this chance > cp -L /etc/resolv.conf ${BUILDCHROOT_DIR}/etc > - ' > + ) 9>${MOUNT_LOCKFILE} > +EOSUDO > } > diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass > index 76602d8..febc5dc 100644 > --- a/meta/classes/wic-img.bbclass > +++ b/meta/classes/wic-img.bbclass > @@ -87,14 +87,16 @@ do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" > > do_wic_image() { > buildchroot_do_mounts > - sudo flock ${MOUNT_LOCKFILE} -c ' \ > + sudo -s < + ( flock 9 > for dir in ${BBLAYERS} ${STAGING_DIR} ${ISARROOT}/scripts; do > mkdir -p ${BUILDCHROOT_DIR}/$dir > if ! mountpoint ${BUILDCHROOT_DIR}/$dir >/dev/null 2>&1; then > mount --bind --make-private $dir ${BUILDCHROOT_DIR}/$dir > fi > done > - ' > + ) 9>${MOUNT_LOCKFILE} > +EOSUDO > export FAKEROOTCMD=${FAKEROOTCMD} > export BUILDDIR=${BUILDDIR} > export MTOOLS_SKIP_CHECK=1 > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > index 234d339..b385825 100644 > --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > @@ -214,7 +214,8 @@ isar_bootstrap() { > fi > fi > E="${@bb.utils.export_proxies(d)}" > - sudo -E flock "${ISAR_BOOTSTRAP_LOCK}" -c "\ > + sudo -E -s < + ( flock 9 > set -e > if [ ! -e "${DEPLOY_ISAR_BOOTSTRAP}" ]; then > rm -rf "${ROOTFSDIR}" > @@ -295,7 +296,9 @@ isar_bootstrap() { > > # Finalize debootstrap by setting the link in deploy > ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_ISAR_BOOTSTRAP}" > - fi" > + fi > + ) 9>'${ISAR_BOOTSTRAP_LOCK}' > +EOSUDO > } > > CLEANFUNCS = "clean_deploy" > -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de