From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6588037979633090560 X-Received: by 2002:a19:988c:: with SMTP id a134-v6mr327952lfe.3.1533897125815; Fri, 10 Aug 2018 03:32:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:4e03:: with SMTP id c3-v6ls622383lfb.14.gmail; Fri, 10 Aug 2018 03:32:05 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxYmBqfvH3fuwo9DSvDrg2GCQhM6OX19NhR4oMv8Pw5HTADrAzFghb807+3eTwpXHmQGEMZ X-Received: by 2002:a19:5344:: with SMTP id h65-v6mr324648lfb.2.1533897125290; Fri, 10 Aug 2018 03:32:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533897125; cv=none; d=google.com; s=arc-20160816; b=P4pXaXgRalO+xRRGS93anlEqaapU6/xRaVhpcAacR/hPS2gI/tAfDUHAQntxmb0zQi j4ef7MGmodOpesviI8jGOD3TfSEDa3o82hBqmtuOGQDLbvhwt50sUDZrbMTC8HwYdX+b 9XoxX4J4Yd5McSFyJgqPeFU/ktzYCWGiDPp2DKjgI+r8cR5cezQj10n4Zaf9j3BW6p+u RUtRb3ysPsA/Dc6YdkTq0Kf15Em6YVL7jqNJn1vQZRoXtNMOPlwv64IV3rouc0KpYFRw 3la+MBzucmIIPEAJvs5LcJoVyBuQtt9FSYHcl9O7Ry35fUimnNwuY0DFUQUdKka4UUHZ +kiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :arc-authentication-results; bh=BPpyL/KZZL5JtOM4qzWLiVU08BC+OX68Qq0YUl0Zovw=; b=swdISwES6ainpf1bC18DMElBttQuzCXe1fGW1XvGnkpvglT4Tow9qf9v8aZseoY+5i mZGaKqldXxG5fCTlLoL4QeK7sw4WvIJZISxJwKcwjp+3l29psm0rDxiuRBGYwVH7JByt aEjQl9u6YqKrgBTVyvtuue7N6aiTNKf+i8LIN5nChbAYqZ1JjAOLyUW9W37h6VemQn5R bbiNueFiXNLzVfX36pk8y9A+1/L3JbWI3g/ZB974nOYXXb1c1aFBbl5QMlD1EweHgBrh T/5JGkWOOeAZCjUB9tKzA99lx/bj3WaV6jA3wEyccX6JvtKMt9qghK9Efjh0mJO/GyQD I2vw== 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 v6-v6si364018ljj.2.2018.08.10.03.32.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Aug 2018 03:32:05 -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 azat.i.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w7AAVonL003471 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Fri, 10 Aug 2018 12:32:03 +0200 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH 2/2] isar-bootstrap: exit if command fails under flock Date: Fri, 10 Aug 2018 12:31:50 +0200 Message-Id: <20180810103150.28342-3-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180810103150.28342-1-mosipov@ilbers.de> References: <20180810103150.28342-1-mosipov@ilbers.de> X-TUID: rWT0zXd/Zp5V 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}" -- 2.11.0