From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6588037979633090560 X-Received: by 2002:adf:f787:: with SMTP id q7-v6mr1055592wrp.5.1534063599221; Sun, 12 Aug 2018 01:46:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:2d41:: with SMTP id t62-v6ls1387092wmt.11.canary-gmail; Sun, 12 Aug 2018 01:46:38 -0700 (PDT) X-Google-Smtp-Source: AA+uWPw8jj4JC1PD3M8ltgAz3YChRKDEdQuHoaCsPzFY+BQ4iuD/vC6JPix4dsHFi51TMtOueOR+ X-Received: by 2002:a1c:2d57:: with SMTP id t84-v6mr764143wmt.18.1534063598741; Sun, 12 Aug 2018 01:46:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534063598; cv=none; d=google.com; s=arc-20160816; b=frL3ETjumPgjTozL59P1usdB0vEM+LomkGOTtjO7nlQHfaMztDcNeOvkZvF7mRls2K lp4skWaOLB0JH2iloNrrzD6DquC61Xw40Ibcdldt45WOrntTL5Rc7Dsne5KJFcWW/1bE NsPC4Ab+Rk6NT82qcZwBZ4v7JrKWQt2IY1zvDMsmRehs9q7vuJ+2Uelhvd/wC2YF93SO BAG6O+Jjx0+CaVvKnQkRrqYyW82XDVK1BHWc1nbYTAHF0eWys4LSdiuFAPLpDxxoobk6 IUJohDy5tHMVQCNDqC/lmtpytGtVSUMNf6Sj+kxWoRFx86ZGGsqo/lKLE+RIcBifXwRE yTqg== 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:to:subject :arc-authentication-results; bh=e5HuN0MGAcg2lk62lJ8OzZKcSkWdtKUF6iDE3qD0lqk=; b=A97gxmYWZX6guTyBdtse1qpw54rML9iUN3hTxhuofkM1+C3IsIxphYTLMW/aX/fWDI EX3zlz2NT7r0T0vQt4d9zi1S/8/C07jDE5driryYx49a9/BrrQ2dnjRXrpCUyMbjLIsQ YcQl9gv3ZpJnZSyUiT42iffFrSu3+0jbEw5K7RXDAZx9oDtNWp+UBKy+2qB/8yI6uIcQ vtaWpWZL3CCBw61Q7C7LFYYucS0dqnWPlr8pqLdgR6iWSasHQXZgXVyTFAeJH3gzpNne 96r8WWeOhMpeaZRU61hLKsKrUJwy9XdoPNuWBu0MZZE1ZFtrl5XKyZnFC2QQZikL5CR/ SRjg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id k1-v6si400308wrv.4.2018.08.12.01.46.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Aug 2018 01:46:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from [192.168.50.180] (nat-ppp-217.71.235.199-satnet-spb.ru [217.71.235.199] (may be forged)) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w7C8kZFe010540 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Sun, 12 Aug 2018 10:46:37 +0200 Subject: Re: [PATCH 2/2] isar-bootstrap: exit if command fails under flock To: Jan Kiszka , isar-users@googlegroups.com References: <20180810103150.28342-1-mosipov@ilbers.de> <20180810103150.28342-3-mosipov@ilbers.de> From: "Maxim Yu. Osipov" Organization: ilbers GmbH Message-ID: <239acee3-b103-3cdf-8edc-f7810ec5b8a0@ilbers.de> Date: Sun, 12 Aug 2018 11:46:30 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: FJMOzFr+kzhn Hi Jan, On 08/11/2018 06:52 PM, Jan Kiszka wrote: > 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? Actually, 'set -e' is put automatically in corresponding run.do_bootstrap script but it doesn't work for flock case. Maxim. -- 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