From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6657829413861720064 X-Received: by 2002:a17:906:938b:: with SMTP id l11mr412996ejx.8.1550146707506; Thu, 14 Feb 2019 04:18:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:3555:: with SMTP id s21ls468897eja.3.gmail; Thu, 14 Feb 2019 04:18:26 -0800 (PST) X-Google-Smtp-Source: AHgI3IYvvPUAU/9LCVjZj4UAl5WjaSJD8T8EvJM1z2gshNn40RyWY2uhyxSFiXf0fdwBpdEA4Bbf X-Received: by 2002:a17:906:b813:: with SMTP id dv19mr412958ejb.6.1550146706408; Thu, 14 Feb 2019 04:18:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550146706; cv=none; d=google.com; s=arc-20160816; b=uXLY/o8U63eN47x8Av0dfcp6Bn7nyiBt04vRArIPoORibBkxjOQuH8ytGSWNhUR3L+ 7uD9HPr6rSWBwVK8GxDLzaK1XFF04V2U+qc32iWJmcB+TAWB0vSMKPJ9shbVTyt4oOkn IDl2SboL9/Lu9pBSPoML/Eb16UkWkD3C05i7ctenb01/oRmqky8P/hPnwY0rfCDYsbzw 687HoJPYD/y49Kik+QvO1dGkFfet2cV1P2Z7Tu4l7uIXcGgPWJqIbPQS9yoE1BPgdox4 E6uUkR91I/w7i7Bq8ulpD+WNJLju64Zo3GA98FcrMBeLGg09Fg9thHmwt6TYTaanpI6G cmzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=912H/3m/qjiSoZPM8idmVuasOTiUfXKZGYh4zvwmsuU=; b=ZDWkl2uc09Eve1D86I6h2brxnJiTyq6q8pfsxHm2EDUvlMedGkzGkJcRmJxbf8thJ7 WwSaC/NQaJUeNkDWozq79iJGxwRNQYr2LyzOUlsZn90KJij2M0mO816I8aPZxnA6GYRR FYishqrTiek5Uw0ikglCCEPAW9OFKAuO8k6c7P2IzsqlGXYCJ5oe446+QF8XPkSeBbWV 2qK9FkRTsZY/3C6eAJJdJNI8Q/VrBipH2Q4XmJUWYP0R0fVMZmGYxgWHnnADkmwWblgx 1HoUIHGTq57kriKpQIM8VNIzHQkRNZLrEdA4fI63NT6pMYdaJ1JtJvEnb+zgjYuyUcG0 OkMg== 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 u9si129657edp.1.2019.02.14.04.18.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 04:18:26 -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 x1ECIPdV016634 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Feb 2019 13:18:25 +0100 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.181]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x1ECIPIl012568; Thu, 14 Feb 2019 13:18:25 +0100 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH] meta: refactored flock usage Date: Thu, 14 Feb 2019 13:18:19 +0100 Message-Id: <20190214121819.22037-1-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: TYsD/hnXosmo 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 | 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 <${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 </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 <'${ISAR_BOOTSTRAP_LOCK}' +EOSUDO } CLEANFUNCS = "clean_deploy" -- 2.20.1