aboutsummaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorMitchell Horne <mhorne@FreeBSD.org>2020-10-30 18:18:25 +0000
committerMitchell Horne <mhorne@FreeBSD.org>2020-10-30 18:18:25 +0000
commit0d51f9e58981094b27753669aa8311d4ab157868 (patch)
treec9200a388565842aa101a8321a2c1cf3ecee8b48 /release
parent027b4efccff8b55333c657ec6c9fb5f276fd837a (diff)
downloadsrc-0d51f9e58981094b27753669aa8311d4ab157868.tar.gz
src-0d51f9e58981094b27753669aa8311d4ab157868.zip
vmimage.subr: noisier failure for unsupported targets
The return code of write_partition_layout() doesn't bubble up, so an invocation of make vm-release for an incorrect/unsupported target will appear to succeed while make vm-install will fail due to missing files. This isn't a common point of failure, but is worth handling properly. Upgrade this case to print a message to stderr, and exit in place. This is okay to do since at this point in the execution of mk-vmimage.sh, cleanup() has already been run. Reviewed by: gjb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D26985
Notes
Notes: svn path=/head/; revision=367176
Diffstat (limited to 'release')
-rw-r--r--release/tools/vmimage.subr4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index a7fe65ac5e59..1f4d40ce913f 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -43,8 +43,8 @@ write_partition_layout() {
ROOTFSPART="-p freebsd-ufs/rootfs:=${VMBASE}"
;;
*)
- # ENOTSUPP
- return 1
+ echo "vmimage.subr: unsupported target '${TARGET}:${TARGET_ARCH}'" >&2
+ exit 1
;;
esac