diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2017-09-05 12:57:45 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2017-09-05 12:57:45 +0000 |
| commit | 708c2585e3d801be8c3ba5e6a712fcb667bc7673 (patch) | |
| tree | f921021bc3bb90dc27adf914814ac75a543edd08 /release/i386/make-memstick.sh | |
| parent | 733ba7f881784dc588a317e29e78c9cff759eb08 (diff) | |
| download | src-708c2585e3d801be8c3ba5e6a712fcb667bc7673.tar.gz src-708c2585e3d801be8c3ba5e6a712fcb667bc7673.zip | |
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 change applies arm64's r308171 to the other make-memstick.sh
versions.
Reviewed by: gjb
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D12195
Notes
Notes:
svn path=/head/; revision=323178
Diffstat (limited to 'release/i386/make-memstick.sh')
| -rwxr-xr-x | release/i386/make-memstick.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/release/i386/make-memstick.sh b/release/i386/make-memstick.sh index f824382ec4b0..c8f6f13de6cf 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 |