From owner-svn-src-head@freebsd.org Mon Oct 22 19:39:21 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A9B88105E944; Mon, 22 Oct 2018 19:39:21 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5F5AF8EEB2; Mon, 22 Oct 2018 19:39:21 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5A37824C2C; Mon, 22 Oct 2018 19:39:21 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9MJdLrf071018; Mon, 22 Oct 2018 19:39:21 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9MJdKiW071014; Mon, 22 Oct 2018 19:39:20 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201810221939.w9MJdKiW071014@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 22 Oct 2018 19:39:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r339609 - in head/release: amd64 i386 powerpc sparc64 X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head/release: amd64 i386 powerpc sparc64 X-SVN-Commit-Revision: 339609 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Oct 2018 19:39:21 -0000 Author: emaste Date: Mon Oct 22 19:39:20 2018 New Revision: 339609 URL: https://svnweb.freebsd.org/changeset/base/339609 Log: release: set -e to exit on error in iso image scripts Reviewed by: gjb Differential Revision: https://reviews.freebsd.org/D17651 Modified: head/release/amd64/mkisoimages.sh head/release/i386/mkisoimages.sh head/release/powerpc/mkisoimages.sh head/release/sparc64/mkisoimages.sh Modified: head/release/amd64/mkisoimages.sh ============================================================================== --- head/release/amd64/mkisoimages.sh Mon Oct 22 18:41:22 2018 (r339608) +++ head/release/amd64/mkisoimages.sh Mon Oct 22 19:39:20 2018 (r339609) @@ -23,6 +23,8 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +set -e + if [ -z $ETDUMP ]; then ETDUMP=etdump fi Modified: head/release/i386/mkisoimages.sh ============================================================================== --- head/release/i386/mkisoimages.sh Mon Oct 22 18:41:22 2018 (r339608) +++ head/release/i386/mkisoimages.sh Mon Oct 22 19:39:20 2018 (r339609) @@ -23,6 +23,8 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +set -e + if [ "$1" = "-b" ]; then # This is highly x86-centric and will be used directly below. bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot" Modified: head/release/powerpc/mkisoimages.sh ============================================================================== --- head/release/powerpc/mkisoimages.sh Mon Oct 22 18:41:22 2018 (r339608) +++ head/release/powerpc/mkisoimages.sh Mon Oct 22 19:39:20 2018 (r339609) @@ -23,6 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +set -e if [ "$1" = "-b" ]; then bootable=1 Modified: head/release/sparc64/mkisoimages.sh ============================================================================== --- head/release/sparc64/mkisoimages.sh Mon Oct 22 18:41:22 2018 (r339608) +++ head/release/sparc64/mkisoimages.sh Mon Oct 22 19:39:20 2018 (r339609) @@ -22,6 +22,8 @@ # resulting ISO image, base-bits-dir contains the image contents and # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. +set -e + if [ $# -lt 3 ]; then echo "Usage: $0 [-b] image-label image-name base-bits-dir [extra-bits-dir]" > /dev/stderr exit 1