git: c8d5eda2d4ee - stable/14 - vmimage.subr: Pass $INSTALLOPTS to install*

From: Colin Percival <cperciva_at_FreeBSD.org>
Date: Wed, 11 Sep 2024 05:29:31 UTC
The branch stable/14 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=c8d5eda2d4eec339ce880e28d4c4590a35ede2e1

commit c8d5eda2d4eec339ce880e28d4c4590a35ede2e1
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-08-31 23:38:02 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-09-11 05:28:59 +0000

    vmimage.subr: Pass $INSTALLOPTS to install*
    
    This makes it possible for a VM build configuration file to pass
    options to make installworld/installkernel/distribution, e.g.
    WITHOUT_DEBUG_FILES=YES in order to produce smaller images.
    
    Note that these options are only applied at install time, not at
    build time (since the same build is installed into many different
    VM images), so not all src.conf options are usable here.
    
    Sponsored by:   Amazon
    Differential Revision:  https://reviews.freebsd.org/D46506
    
    (cherry picked from commit 81d3df02bcf5ed6e41a91fd9fbc3b81cfe809ff3)
---
 release/tools/vmimage.subr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 72540dad14a8..c95a6dc82937 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -52,7 +52,7 @@ vm_install_base() {
 	# Installs the FreeBSD userland/kernel to the virtual machine disk.
 
 	cd ${WORLDDIR} && \
-		make DESTDIR=${DESTDIR} \
+		make DESTDIR=${DESTDIR} ${INSTALLOPTS} \
 		installworld installkernel distribution || \
 		err "\n\nCannot install the base system to ${DESTDIR}."