From nobody Sat Aug 22 05:32:05 2026 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 4hRm5R14pfz6pGn2 for ; Sat, 22 Aug 2026 05:32:11 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hRm5Q5PQkz44Hl for ; Sat, 22 Aug 2026 05:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787376730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S+QGzrjXRD/d17ONKHY7LB5YHzlZ84Osf0tEnAog6fo=; b=DamPRrZN6J/tJS+6Zu1SOaJ1s6YkNprJvNwcReWk5MagH57/iQrxG+1GIBqkvLjovPPCUX /qRVFVrm0RW9M5RTmn7QDRpNgGsDPzntnQCzVKTsHDpQSEfovLk9yr0N8NUh9ho6EAdfuU jqYLGRrOaW4vdOKuGX0JB7ZQ3w0ZsOmMuT+9Ybob9SdnAD71/VpdOxHps1uNmSGvl7OOv9 Jfvq4JjStb35aoxxsjr67mgh3WoNPUIX4c2a2HnnMWEUHYzU2rz6PoaI1jL0Y93A6MYxH/ ecfGteC41EVbOGTA+EE+mDV/2ST55st5GBfej05WgseWEmvS/NRRi9IKPsrIdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787376730; a=rsa-sha256; cv=none; b=MgouTv9vQPVqBvPTvE+3vgUU0Js3CeZrYi5lbgr2Fm9+41RFY+uJetipOlEJTv2ZkFPMK0 N65X1PiHjygnYlueHVrztukOwQm4dQwVjAnBVPRaLynsx1Nayktpj8nUtDeP8xyjaoSuxI iysv0pUa1g2mwJn3h4qVow3Uu3P0Dfs4G8BpYA0FtufwvTBLdIuPuMLuNE2aiMm5sbEZaY RwTeD72idvmIP7moH8B4tGyFvNAe1hYadvrN+XrFyRBuT8xqqV9iFmpID0popHPwe4t1Zx V2G23/6aw4mcRWjGw5KjUYuMGgWAJqhOc4/XSek86eKVwOlMoPIynXw7dRda4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787376730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S+QGzrjXRD/d17ONKHY7LB5YHzlZ84Osf0tEnAog6fo=; b=WI2WYZE8HcN9TK9iMAc4Y/kr9Shk/IGOUBNhg3vCzJUNsqHMslpucHykzcaD6WlzKfyjj2 DL9uJgiL3VIpI6RMRzZpAUBpCa4M90lK0vZqEjPqhQp8xtRZus13iz0Lfv0EDRlAp7d9pz v16z8dLpw+b44YgGAioKXUjWWsUy0dT9OHEkZ9BSEFOXhMNqIsr4vRcQlvF3wESvAeCgHP inoTmNjVEWotARcXqsky7P1579o2paMJcr3bTH50uS9RK3DQ1nH5t+SbMjxSKt4rzW/2hE wYFVOlrmpP59ZVqh4gFODtv955tRKmzXXSifrwOK7abWJpSkUUGlUvlfvNsELA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hRm5Q4M8hzccy for ; Sat, 22 Aug 2026 05:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d680 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Aug 2026 05:32:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Stephen J. Kiernan From: Devin Teske Subject: git: 70c9d0479900 - main - bsdinstall: Ensure logging retained when BSDINSTALL_LOG is not changed by preamble 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dteske X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70c9d047990017394a872474c81fcdd66b502168 Auto-Submitted: auto-generated Date: Sat, 22 Aug 2026 05:32:05 +0000 Message-Id: <6a893455.1d680.62f622a2@gitrepo.freebsd.org> The branch main has been updated by dteske: URL: https://cgit.FreeBSD.org/src/commit/?id=70c9d047990017394a872474c81fcdd66b502168 commit 70c9d047990017394a872474c81fcdd66b502168 Author: Stephen J. Kiernan AuthorDate: 2026-08-22 05:29:37 +0000 Commit: Devin Teske CommitDate: 2026-08-22 05:29:37 +0000 bsdinstall: Ensure logging retained when BSDINSTALL_LOG is not changed by preamble Before the preamble script is sourced, initialize BSDINSTALL_LOG with the file in $debugFile, if it is not already set. Without this change, the bsdinstall script would assume the preamble set BSDINSTALL_LOG to empty and the comparison with $debugFile will fail, causing the log to be re-initialized to /dev/null. Reviewed by: dteske MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D25343 --- usr.sbin/bsdinstall/scripts/script | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/bsdinstall/scripts/script b/usr.sbin/bsdinstall/scripts/script index 4c792d80df6a..6e4aae8f5890 100755 --- a/usr.sbin/bsdinstall/scripts/script +++ b/usr.sbin/bsdinstall/scripts/script @@ -98,6 +98,7 @@ awk 'BEGIN {pathb=ARGV[2]; ARGV[2]=""} /^#!/{b=1} { "$SCRIPT" $TMPDIR/bsdinstall-installscript-setup \ >$TMPDIR/bsdinstall-installscript-preamble +: ${BSDINSTALL_LOG="${debugFile#+}"} . $TMPDIR/bsdinstall-installscript-preamble export BSDINSTALL_DISTDIR