The branch main has been updated by brd:

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

commit 3bcd261265e1187a4dbed64104727022edb9e85b
Author:     Brad Davis <[email protected]>
AuthorDate: 2022-06-06 01:04:04 +0000
Commit:     Brad Davis <[email protected]>
CommitDate: 2022-06-06 01:04:04 +0000

    bsdinstall: allow overriding DISTRIBUTIONS in the normal auto mode
    
    Reviewed by:    dteske
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    Differential Revision: https://reviews.freebsd.org/D35355
---
 usr.sbin/bsdinstall/scripts/auto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto
index 7398f382273c..7d5396d15c01 100755
--- a/usr.sbin/bsdinstall/scripts/auto
+++ b/usr.sbin/bsdinstall/scripts/auto
@@ -152,7 +152,7 @@ bsdinstall keymap
 trap error SIGINT      # Catch cntrl-C here
 bsdinstall hostname || error "Set hostname failed"
 
-export DISTRIBUTIONS="base.txz kernel.txz"
+export DISTRIBUTIONS="${DISTRIBUTIONS:-base.txz kernel.txz}"
 if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then
        DISTMENU=`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $1,$5,$6}' 
$BSDINSTALL_DISTDIR/MANIFEST`
        DISTMENU="$(echo ${DISTMENU} | sed -E 's/\.txz//g')"

Reply via email to