From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6657829413861720064 X-Received: by 2002:a5d:5111:: with SMTP id s17mr1096611wrt.13.1552067391822; Fri, 08 Mar 2019 09:49:51 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:f107:: with SMTP id p7ls124355wmh.6.canary-gmail; Fri, 08 Mar 2019 09:49:51 -0800 (PST) X-Google-Smtp-Source: APXvYqxJ+0ISWjIrBWGVIiJS6UBDV4tuNEZbyq3UssA0w6N67dxUr+7Ona+3yhe1z1RJLqa9Z/80 X-Received: by 2002:a05:600c:21d4:: with SMTP id x20mr1518036wmj.25.1552067391282; Fri, 08 Mar 2019 09:49:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1552067391; cv=none; d=google.com; s=arc-20160816; b=U8W4tXQ/Jh7gqUplVVoWkoqUcJ7Fc48hDHzBTwQamYUieVH9hmKa8LrAh5jBRAbvfx PYZ4sLQwmRYXQzKf3xkWmkBFONgfvdMBRURPMLX/WgN1IvUo/VPnFCNl1Zi1BYJ/QExN eLbp1Ffv5NrxZT3Qz6IzkemC+hKallrBviB9mS5mw50dU3skucY7FCz3RENkzP82KoHt UgVNQoDdp3VKU0ICBynoFwdJdJtpRiZE4bFG9Ajb/ZIpV1dSz/TaXsIYBev7syfII+Ts LnBOhvVJ1+pfzoKvh6CcF28sTMG1GwPly2ZRtZ+7pX9Ly/ZVkBxRecIDmv4VIj2wfjAV ooXQ== 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:cc:to:subject; bh=ogvks9CBOsZZcnbrWrEtp+ldv1vHH2ndJ+olv9LLd2E=; b=KKGsaQq2GLnYMkFnJEnTmBzJ+7VMx9IzsetDOejEIKgpFXLU9nFEYWbFZ4bL3ytlW2 R9IUZLvuMzZMB9N8gt5UhO72g5+ugCHvxaPuPAFoV6q2En59uJtT2a8/EPmPFGPXlAM7 L/CpmtsFE4k9VAes/3ss3Rfj/zdC1371QSbU5LapkIwqnl32iPjZFdkccqgkik7RjfGk DfHeBoswW+BNgxZJJIxyDCqRgWJ3CKorum7bLpLAZPLG0xFqXyZNkJxTzIzCjlroiXGu jL/QlPi4R3V3WH0MpJgw6C6wrZUiMYAZqMkBaZzIcZYIPRTxRFYr6IK0ScJoQlXd6cgC dLXA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id m1si531398wrj.4.2019.03.08.09.49.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 09:49:51 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x28HnnYs008501 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 8 Mar 2019 18:49:49 +0100 Received: from [139.25.68.37] (md1q0hnc.ad001.siemens.net [139.25.68.37] (may be forged)) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x28HnnPF030616; Fri, 8 Mar 2019 18:49:49 +0100 Subject: Re: [PATCH v2] meta: refactored flock usage To: "[ext] 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: Jan Kiszka Message-ID: <2b7ea7d6-5c27-2b86-e05a-37d21f58358f@siemens.com> Date: Fri, 8 Mar 2019 18:49:48 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 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-TUID: Dj07Zxu0t9n9 On 14.02.19 17:08, [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. > > 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}" Are you sure that the removal of '' is correct here as well? What binds that package list to --include=? Jan > 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" > -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux