diff options
author | emaste <emaste@FreeBSD.org> | 2017-09-12 00:44:16 +0000 |
---|---|---|
committer | emaste <emaste@FreeBSD.org> | 2017-09-12 00:44:16 +0000 |
commit | 37c44a213b3da37bce7f8639e9d6719514203493 (patch) | |
tree | 60e28c0e4719179f2d8cdbf43866178e1c8151e7 | |
parent | f3afb05035e0c026f3188d677103d2b20082f119 (diff) | |
download | FreeBSD-src-37c44a213b3da37bce7f8639e9d6719514203493.zip FreeBSD-src-37c44a213b3da37bce7f8639e9d6719514203493.tar.gz |
make-memstick.sh: use 'set -e' to abort if any step fails
Also remove the now-redundant error handling that was only for makefs.
This script was run on an older FreeBSD host that lacked efi-on-mbr
support in makefs. A warning was emitted on the console (from makefs)
but the script continued running and exited with 0.
MFC of r308171 (arm64) and r323178 (other architectures).
-rwxr-xr-x | release/amd64/make-memstick.sh | 6 | ||||
-rwxr-xr-x | release/arm64/make-memstick.sh | 6 | ||||
-rwxr-xr-x | release/i386/make-memstick.sh | 6 | ||||
-rwxr-xr-x | release/powerpc/make-memstick.sh | 6 |
4 files changed, 8 insertions, 16 deletions
diff --git a/release/amd64/make-memstick.sh b/release/amd64/make-memstick.sh index 52e17cc..64edb73 100755 --- a/release/amd64/make-memstick.sh +++ b/release/amd64/make-memstick.sh @@ -10,6 +10,8 @@ # $FreeBSD$ # +set -e + PATH=/bin:/usr/bin:/sbin:/usr/sbin export PATH @@ -31,10 +33,6 @@ fi echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local makefs -B little -o label=FreeBSD_Install ${2}.part ${1} -if [ $? -ne 0 ]; then - echo "makefs failed" - exit 1 -fi rm ${1}/etc/fstab rm ${1}/etc/rc.conf.local diff --git a/release/arm64/make-memstick.sh b/release/arm64/make-memstick.sh index d47fad0..760f362 100755 --- a/release/arm64/make-memstick.sh +++ b/release/arm64/make-memstick.sh @@ -10,6 +10,8 @@ # $FreeBSD$ # +set -e + PATH=/bin:/usr/bin:/sbin:/usr/sbin export PATH @@ -31,10 +33,6 @@ fi echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local makefs -B little -o label=FreeBSD_Install ${2}.part ${1} -if [ $? -ne 0 ]; then - echo "makefs failed" - exit 1 -fi rm ${1}/etc/fstab rm ${1}/etc/rc.conf.local diff --git a/release/i386/make-memstick.sh b/release/i386/make-memstick.sh index f824382..c8f6f13 100755 --- a/release/i386/make-memstick.sh +++ b/release/i386/make-memstick.sh @@ -10,6 +10,8 @@ # $FreeBSD$ # +set -e + PATH=/bin:/usr/bin:/sbin:/usr/sbin export PATH @@ -31,10 +33,6 @@ fi echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local makefs -B little -o label=FreeBSD_Install ${2}.part ${1} -if [ $? -ne 0 ]; then - echo "makefs failed" - exit 1 -fi rm ${1}/etc/fstab rm ${1}/etc/rc.conf.local diff --git a/release/powerpc/make-memstick.sh b/release/powerpc/make-memstick.sh index 3c1cfa4..92f27a2 100755 --- a/release/powerpc/make-memstick.sh +++ b/release/powerpc/make-memstick.sh @@ -10,6 +10,8 @@ # $FreeBSD$ # +set -e + PATH=/bin:/usr/bin:/sbin:/usr/sbin export PATH @@ -36,10 +38,6 @@ echo '/dev/da0s3 / ufs ro,noatime 1 1' > ${1}/etc/fstab echo 'root_rw_mount="NO"' > ${1}/etc/rc.conf.local rm -f ${tempfile} makefs -B big ${tempfile} ${1} -if [ $? -ne 0 ]; then - echo "makefs failed" - exit 1 -fi rm ${1}/etc/fstab rm ${1}/etc/rc.conf.local |