Date: Mon, 22 Oct 2018 19:39:20 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> 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 Message-ID: <201810221939.w9MJdKiW071014@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810221939.w9MJdKiW071014>