From owner-svn-src-head@freebsd.org Fri Oct 30 18:18:26 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 89DDA458428; Fri, 30 Oct 2020 18:18:26 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CN9Xy33hmz4K9Z; Fri, 30 Oct 2020 18:18:26 +0000 (UTC) (envelope-from mhorne@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 4C5551A764; Fri, 30 Oct 2020 18:18:26 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09UIIQk3015355; Fri, 30 Oct 2020 18:18:26 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09UIIQWE015354; Fri, 30 Oct 2020 18:18:26 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <202010301818.09UIIQWE015354@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mhorne set sender to mhorne@FreeBSD.org using -f From: Mitchell Horne Date: Fri, 30 Oct 2020 18:18:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367176 - head/release/tools X-SVN-Group: head X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: head/release/tools X-SVN-Commit-Revision: 367176 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.33 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: Fri, 30 Oct 2020 18:18:26 -0000 Author: mhorne Date: Fri Oct 30 18:18:25 2020 New Revision: 367176 URL: https://svnweb.freebsd.org/changeset/base/367176 Log: 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 Modified: head/release/tools/vmimage.subr Modified: head/release/tools/vmimage.subr ============================================================================== --- head/release/tools/vmimage.subr Fri Oct 30 18:16:10 2020 (r367175) +++ head/release/tools/vmimage.subr Fri Oct 30 18:18:25 2020 (r367176) @@ -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