From nobody Mon Jun 06 01:23:52 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 63CC01BEB980; Mon, 6 Jun 2022 01:23:53 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LGbNn01XKz3DW4; Mon, 6 Jun 2022 01:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654478633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rw92l3tgO/47U80x8yWIXqNiv5A0F6BSlWuACSgSbo=; b=cHojS7QTqU4Af6K6j1GS05cWJOVVe5jE9dkYq6AZE43rRg0rpDv+f7wvUQC2bruzEW5Q5m 7Y0rUIrrS+/GeVsxSYm+xq6lwPdH9bdVM2OtA3whGyc66vmOHjUvXd0Tc43/qjjrYfthEl Rv3XQNao/6K2kSmEQ6pmZXkISup6/2wsoYXFCyHCcyT3/S4N3Syjt+gLv/iJ/HjKEiIpse V53dC9wRIeLXkzL2wuk0zAW8k19cZvymdLrQrTjtIUaq6DbShgo9maGRgn8IJ0mzGXfwtc syj3GHOhIaPlvVVQEUP3jnEX5++0mKtlTAEQDwGbp6xVCI2l9cZC7FuhOH2gEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C6E551CE53; Mon, 6 Jun 2022 01:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2561NqGB018820; Mon, 6 Jun 2022 01:23:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2561Nqtv018819; Mon, 6 Jun 2022 01:23:52 GMT (envelope-from git) Date: Mon, 6 Jun 2022 01:23:52 GMT Message-Id: <202206060123.2561Nqtv018819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brad Davis Subject: git: 3bcd261265e1 - main - bsdinstall: allow overriding DISTRIBUTIONS in the normal auto mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bcd261265e1187a4dbed64104727022edb9e85b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654478633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rw92l3tgO/47U80x8yWIXqNiv5A0F6BSlWuACSgSbo=; b=JiyZSXMic7GBYyGf4NCNdBznjq5Ow1XpyT7GEqvm/7xeWQR6PqTgqWHzZf+KTYxt4oXyTy 4jTCtvq/P7xl/3rrqci3ldUy17v1dWy9GC5g0sknLA3yYuBWUwPQ+oBeRlb/JtOCpYRa4n 6iZS6ZvbXppZOVZ9mqj73QSIQ4rJdvKTm2qC6a2Qh/A+qZ52cCKxlJh9ex9bK5GhB8zzoB 3K3wywUBu9Fw1UDf0y1alZKnFyqZH/FUF+uD/KaPF5ZP9smIIWhrhx2BLGz6ZdFsLbrgcT 7g4I6Abn2xNunKJzdogE3FeaGFg19D4qh6V9qh4Q+3TcWuIH5CPdUNh6so7t1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654478633; a=rsa-sha256; cv=none; b=c7LiTqUMLk5J79BEksaJ3sN3omxfDo6PxZbEn9Wy7zRC2G+/zrEzwv05G5Nsh6W2nGP/Am 4TVvBplKNF0z1OPBOuavIeugZjn2DzRpemtxeMSFtxuJo84OU/yLVbKnXFEP/9mQx1RbEH 95uAxrP8D1hfY+3F1/vyT6g8ZR8eexY4WuQDQplsJqQol/oMpXir4LWN1en+0uKtA84MaH oQCqei7UjsAbbUJsgmpHSq8iVJ9vJvvizt83wl1xf5iUAOYLf9vVDW91rHqQ76ojd+NE3h tDUVGrb3KBOVyLrqDg4e3IMsUDrahU2VYJ5yUONVDeGaEuMUKNq1COQAGEFXTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brd: URL: https://cgit.FreeBSD.org/src/commit/?id=3bcd261265e1187a4dbed64104727022edb9e85b commit 3bcd261265e1187a4dbed64104727022edb9e85b Author: Brad Davis AuthorDate: 2022-06-06 01:04:04 +0000 Commit: Brad Davis 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')"