From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6588749641152462848 X-Received: by 2002:a19:e516:: with SMTP id c22-v6mr664085lfh.19.1534062820774; Sun, 12 Aug 2018 01:33:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:d7a9:: with SMTP id q41-v6ls807774lfi.31.gmail; Sun, 12 Aug 2018 01:33:40 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxY9vzl+XOGXp7jJspsY7Nvjdw1i/rtrkwTDZ/v5LzzpHmeDk4yDp9/e0pEsFgkchc0HYbJ X-Received: by 2002:a19:d71c:: with SMTP id o28-v6mr667275lfg.4.1534062820165; Sun, 12 Aug 2018 01:33:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534062820; cv=none; d=google.com; s=arc-20160816; b=cXwDVAb5rq4PmZo0J5RcUrhw8rhT6hnjP+ifxQtid4hHF0nYXbtBgZBd93J4Q3DQUr cKwlop1+gyT1Yc54X5p5gqOrYivubgjg9q8HAbl+1q19GheTp3Rie83fv/Bi/PVnzqg6 /twrx2nwGRcVqUUmUT3lJdpZSUZTpFeHhUp9r3LNw+iaAyyLqxpHYUigH5Ep/4szLLVK ASn1WvzrmHEmAlt6LuJuHF0RK2URUtF2B1GCTgHCbwDA+8vpuvpWuX792mX5rWpD+INq DmAAAgb2yils87sMS2G/1Y/ZG/DVqxisCkLoRlKyqUhUwp5yRoMTtODxd6FlXICYw9Pz Rl/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from:arc-authentication-results; bh=/T2q2vQrJZFNBt4OBfOHCBhEprWeeTOdBBs2mv2Dvik=; b=IIhyz8su/ltHmAcWmVekiG3nQLQmi/bFDNPSvLgjkMI8WR7fND0dLu7OF/oEZIIELV R631AJXEsN2j69esLJQWuLQyjSrL3avANRwPQDFO2gIft1eHeSMGy0TvctVI+eavm4ES ajW0sjsGKTLl/moMfcYNNlzSEraOgtxWibsjlNRDkGLcB8NSSYYSfR9UAOFZKRKVN174 +oOB1vOTCBXYrHU6oY6a4wbm1Ym4aXuEJKQM4Sk7I8oX2KxCUdFp8MC5UIcHk8rZ/GAW C3Pbj/34SfUFiqIAHCyYQZef2F1VS15yjHItBP0n54ltq6MjsO53HWZffIP9TO/lDI5x JS5A== 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 m76-v6si579367lfi.2.2018.08.12.01.33.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Aug 2018 01:33:40 -0700 (PDT) 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 mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w7C8Xdj7019541 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 12 Aug 2018 10:33:39 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.3.53]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id w7C8Xcu4016811 for ; Sun, 12 Aug 2018 10:33:39 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 1/3] Exit if commands fail under flock Date: Sun, 12 Aug 2018 10:33:36 +0200 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: 3MlikB335vfp From: Jan Kiszka Add set -e to the shells spawned by flock so that any failure of a command will lead to an immediate termination and reporting of the failure. E.g., do_bootstrap could have silently failed so far. Derived from patch by Maxim Osipov. Signed-off-by: Jan Kiszka --- meta/classes/dpkg-base.bbclass | 1 + meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 1 + 2 files changed, 2 insertions(+) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 674c0b5..9b42c42 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -63,6 +63,7 @@ do_build() { sudo mount --bind ${WORKDIR} ${BUILDROOT} sudo flock ${MOUNT_LOCKFILE} -c ' \ + set -e if ! grep -q ${BUILDCHROOT_DIR}/isar-apt /proc/mounts; then \ mount --bind ${DEPLOY_DIR_APT}/${DISTRO} ${BUILDCHROOT_DIR}/isar-apt; \ mount --bind ${DL_DIR} ${BUILDCHROOT_DIR}/downloads; \ diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 8afd470..5fba3dd 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -172,6 +172,7 @@ isar_bootstrap() { shift done sudo flock "${ISAR_BOOTSTRAP_LOCK}" -c "\ + set -e if [ ! -e "${DEPLOY_ISAR_BOOTSTRAP}" ]; then if [ -e "${ROOTFSDIR}" ]; then sudo umount -l "${ROOTFSDIR}/dev" || true -- 2.16.4