From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6588037979633090560 X-Received: by 2002:a19:a8d4:: with SMTP id r203-v6mr610067lfe.14.1534002754434; Sat, 11 Aug 2018 08:52:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9bd9:: with SMTP id w25-v6ls1414891ljj.15.gmail; Sat, 11 Aug 2018 08:52:33 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyXhv7/Tk/oAKUNVS3+aVzb6M+zRhaz8k6oIRrKBteE+7RoXZGRxMHfWKS4bZ8PBVmedZ8f X-Received: by 2002:a2e:8157:: with SMTP id t23-v6mr497795ljg.13.1534002753887; Sat, 11 Aug 2018 08:52:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534002753; cv=none; d=google.com; s=arc-20160816; b=clKGIvxvfHwv/Xw5Wch9vc7Jy/YLk2merPcErhQ2jZs4wDpRuz1HBL4EMcjsdYd75O Hqo44eRiXNvDtUN+PEmBU23avnIwcRDvw0iENQ+aC5zdK5B6MsLp6f+12MkVLaP8D0UV MOURKaEgZW+1rmFIF8OpJvWzfOYtUCf/Jien495ky3dfJZOfaeOtPYgmdTgh1hfa3riN WUe5RKxhfGEJSkuMAOS22RLL1BL/rx+xorQgq05jJh7WDHt2KFZs28/GYXQcoHy+SX5O QmSEWiZQuiG340WkYAR71lslzWQP2nqwKu+Sq8RYfvI0KVIoRBEv7xp79Dn4zByXVabK JsPQ== 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:to:subject :arc-authentication-results; bh=XFnQ28uiGwNsMQ3wIWH2wzg4dFNrGofSR96YVQr59pQ=; b=AtAKIEHhNAFG8rnIIFCcvqy6YKh8ZA2u0FVyBMTlikCRXIrK3lipg3WfSB1oaYGQSU axRPon+GnZC4E2/ncG0QssYFNJ5bwHhYW4R8n+QU8YvTYRBrwiZfMJJzuS7MdrGqTwNG NH2XlR6z1OlwA/7J7w8i+Unpzj52ytFS3KYeVm3pxogFNHkrZTwCzeFIuHeQTWjAcfZd vaOvU4yu6p3fSfIXHr2ZGWCMgP7KaiAu8B917kph9sJj+rxfa2bfx4mglUeQ3m8QofvB AKuXjFPN3Ty/i4TqrTmqtyiPSieZT+MDOtKEu8sfKHB6m+/O9yXHqaI1aNuv3Rakdh3C LQrw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id v6-v6si470280ljj.2.2018.08.11.08.52.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Aug 2018 08:52:33 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id w7BFqX3d022460 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 11 Aug 2018 17:52:33 +0200 Received: from [167.87.2.132] ([167.87.2.132]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id w7BFqWuX011312; Sat, 11 Aug 2018 17:52:32 +0200 Subject: Re: [PATCH 2/2] isar-bootstrap: exit if command fails under flock To: "Maxim Yu. Osipov" , isar-users@googlegroups.com References: <20180810103150.28342-1-mosipov@ilbers.de> <20180810103150.28342-3-mosipov@ilbers.de> From: Jan Kiszka Message-ID: Date: Sat, 11 Aug 2018 17:52:32 +0200 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: <20180810103150.28342-3-mosipov@ilbers.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: pZF/gcvfdt96 On 2018-08-10 12:31, Maxim Yu. Osipov wrote: > If command under 'flock' fails, isar_bootstrap continues to execute. > This is wrong behaviour, which leads that the do_bootstrap task is > considered successfully done. > > Signed-off-by: Maxim Yu. Osipov > --- > .../recipes-core/isar-bootstrap/isar-bootstrap.inc | 28 +++++++++++----------- > 1 file changed, 14 insertions(+), 14 deletions(-) > > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > index 5c90713..60e5d10 100644 > --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > @@ -187,7 +187,7 @@ isar_bootstrap() { > ${DEBOOTSTRAP_KEYRING} \ > "${@get_distro_suite(d, True)}" \ > "${ROOTFSDIR}" \ > - "${@get_distro_source(d, True)}" > + "${@get_distro_source(d, True)}" || exit 1 > > else > sudo -E "${DEBOOTSTRAP}" --verbose \ > @@ -198,45 +198,45 @@ isar_bootstrap() { > ${DEBOOTSTRAP_KEYRING} \ > "${@get_distro_suite(d, False)}" \ > "${ROOTFSDIR}" \ > - "${@get_distro_source(d, False)}" > + "${@get_distro_source(d, False)}" || exit 1 > fi > > # Install apt config > sudo mkdir -p "${ROOTFSDIR}/etc/apt/preferences.d" > sudo install -v -m644 "${APTPREFS}" \ > - "${ROOTFSDIR}/etc/apt/preferences.d/bootstrap" > + "${ROOTFSDIR}/etc/apt/preferences.d/bootstrap" || exit 1 > sudo mkdir -p "${ROOTFSDIR}/etc/apt/sources.list.d" > sudo install -v -m644 "${APTSRCS}" \ > - "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" > + "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" || exit 1 > sudo rm -f "${ROOTFSDIR}/etc/apt/sources.list" > sudo mkdir -p "${ROOTFSDIR}/etc/apt/apt.conf.d" > sudo install -v -m644 "${WORKDIR}/isar-apt.conf" \ > - "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar.conf" > + "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar.conf" || exit 1 > > if [ "${@get_distro_suite(d, True)}" = "stretch" ] && [ "${@get_host_release().split('.')[0]}" -lt "4" ]; then > sudo install -v -m644 "${WORKDIR}/isar-apt-fallback.conf" \ > - "${ROOTFSDIR}/etc/apt/apt.conf.d/55isar-fallback.conf" > + "${ROOTFSDIR}/etc/apt/apt.conf.d/55isar-fallback.conf" || exit 1 > fi > > # Set locale > - sudo install -v -m644 "${WORKDIR}/locale" "${ROOTFSDIR}/etc/locale" > + sudo install -v -m644 "${WORKDIR}/locale" "${ROOTFSDIR}/etc/locale" || exit 1 > > sudo sed -i '/en_US.UTF-8 UTF-8/s/^#//g' "${ROOTFSDIR}/etc/locale.gen" > - sudo -E chroot "${ROOTFSDIR}" /usr/sbin/locale-gen > + sudo -E chroot "${ROOTFSDIR}" /usr/sbin/locale-gen || exit 1 > > # setup chroot > - sudo install -v -m755 "${WORKDIR}/chroot-setup.sh" "${ROOTFSDIR}/chroot-setup.sh" > - sudo "${ROOTFSDIR}/chroot-setup.sh" "setup" "${ROOTFSDIR}" > + sudo install -v -m755 "${WORKDIR}/chroot-setup.sh" "${ROOTFSDIR}/chroot-setup.sh" || exit 1 > + sudo "${ROOTFSDIR}/chroot-setup.sh" "setup" "${ROOTFSDIR}" || exit 1 > > # update APT > - sudo mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${ROOTFSDIR}/dev > - sudo mount -t proc none ${ROOTFSDIR}/proc > + sudo mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${ROOTFSDIR}/dev || exit 1 > + sudo mount -t proc none ${ROOTFSDIR}/proc || exit 1 > > E="${@bb.utils.export_proxies(d)}" > export DEBIAN_FRONTEND=noninteractive > - sudo -E chroot "${ROOTFSDIR}" /usr/bin/apt-get update -y > + sudo -E chroot "${ROOTFSDIR}" /usr/bin/apt-get update -y || exit 1 > sudo -E chroot "${ROOTFSDIR}" /usr/bin/apt-get dist-upgrade -y \ > - -o Debug::pkgProblemResolver=yes > + -o Debug::pkgProblemResolver=yes || exit 1 > > # Finalize debootstrap by setting the link in deploy > ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_ISAR_BOOTSTRAP}" > This is a bit ugly and leaves out a number of commands. Why can't we do "set -e" inside that section? Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux