From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6657829413861720064 X-Received: by 2002:a2e:864f:: with SMTP id i15mr443177ljj.13.1552396702400; Tue, 12 Mar 2019 06:18:22 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:6547:: with SMTP id z68ls2457504ljb.5.gmail; Tue, 12 Mar 2019 06:18:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqzTkP9vf+lpMOYk8GpMqQwgqjHaVamCSUvr7ZqgIJR/1CUjJvY2XCc7WnWPyUoaYUaQ0LJc X-Received: by 2002:a2e:8616:: with SMTP id a22mr9023lji.26.1552396701849; Tue, 12 Mar 2019 06:18:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552396701; cv=none; d=google.com; s=arc-20160816; b=rm00rkeUb9N4NAJaCu+P4YhVgVw+4DACd5q72wgYTV20k5EIB1xidbMYhFyzwltpQX 0+cPDXrvMImsA7QsE13A6b7qY84dwnIshcgVrWgSQFRv6sXjKxwjy4fZsO+LZNkRQRsa Tkj25kuv9n3A/bA2Yx7tfunmTBSe+R1aoGqFd4ABmCD6gRXkfYFfb4q72p/Rnw6Strd7 F8h7NCJ8dFkwdqxSf513SRMYDQPRu7JABHmHQmHuoxqUrEbfNlOBlwyLSoHsR6LtH4WF +LenLweZqq4kFPnOw7CR4tG558sdq6pscNs1GyYl7gIPkbYy6aGGTPiH0aJIHWGHyosD zkvA== 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:organization:from:references:cc:to :subject; bh=tpjXAEFg7LV8aWZek2ZdsHueS7slWYCUAgX3fdChyLs=; b=yGh3nX2R0hO3D9CbpXS+QthgwXUrpHol9kw/UfLvtx9xk4dkCb8EpJiuKfMgmd/i3O N2KJXukKbaM/0iWZTQeiUtG0JS0rkugGTyOB62VAY1zYDOLNcOo1+LrAZdVg4TO/v3bk 2YbQmr6gfZSXrN7rAUdj9cLUY0ENqjWNljXJDO72xRFqiyHQhftenMrbW0SvGGa7SBcj qQgMyoMODqLpW3o8uAcw6UHfY2/StucF7OHdySQvoiPU2Gj/vumetDJF27mpFmDWsISk cdCEj8s4dOCZ4BCERZT04SdIgknuFbjJrJKRtN1DGJ/MYeoconYGb/clwoNpKLQbYLlG Oqnw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id y13si345946lfg.4.2019.03.12.06.18.21 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 06:18:21 -0700 (PDT) Received-SPF: pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from [192.168.50.163] (d51A48A80.access.telenet.be [81.164.138.128]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id x2CDID5W016647 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 12 Mar 2019 14:18:16 +0100 Subject: Re: [PATCH v2] meta: refactored flock usage To: claudius.heine.ext@siemens.com, isar-users@googlegroups.com Cc: Claudius Heine References: <20190214121819.22037-1-claudius.heine.ext@siemens.com> <20190214160805.19980-1-claudius.heine.ext@siemens.com> From: "Maxim Yu. Osipov" Organization: ilbers GmbH Message-ID: <289b2f92-6340-b0a5-9cbe-1f63d69d9f15@ilbers.de> Date: Tue, 12 Mar 2019 14:18:13 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <20190214160805.19980-1-claudius.heine.ext@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED 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: 91bfzwwWMBi/ On 2/14/19 5:08 PM, 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. Applied to the 'next', Thanks, Maxim. > Signed-off-by: Claudius Heine > --- > meta/classes/buildchroot.bbclass | 6 ++++-- > meta/classes/wic-img.bbclass | 6 ++++-- > meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 10 +++++++--- > 3 files changed, 15 insertions(+), 7 deletions(-) > > diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass > index 0d4ff4e..c017b25 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 <<'EOSUDO' > + ( 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..5367a37 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 <<'EOSUDO' > + ( 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..9c82184 100644 > --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > @@ -207,14 +207,16 @@ isar_bootstrap() { > esac > shift > done > - debootstrap_args="--verbose --variant=minbase --include='${DISTRO_BOOTSTRAP_BASE_PACKAGES}'" > + debootstrap_args="--verbose --variant=minbase --include=${DISTRO_BOOTSTRAP_BASE_PACKAGES}" > if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then > if [ -z "${BASE_REPO_KEY}" ] ; then > debootstrap_args="$debootstrap_args --no-check-gpg" > fi > fi > E="${@bb.utils.export_proxies(d)}" > - sudo -E flock "${ISAR_BOOTSTRAP_LOCK}" -c "\ > + export IS_HOST debootstrap_args E > + sudo -E -s <<'EOSUDO' > + ( flock 9 > set -e > if [ ! -e "${DEPLOY_ISAR_BOOTSTRAP}" ]; then > rm -rf "${ROOTFSDIR}" > @@ -295,7 +297,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" > -- Maxim Osipov ilbers GmbH Maria-Merian-Str. 8 85521 Ottobrunn Germany +49 (151) 6517 6917 mosipov@ilbers.de http://ilbers.de/ Commercial register Munich, HRB 214197 General Manager: Baurzhan Ismagulov