From nobody Thu Feb 5 08:47:27 2026 X-Original-To: dev-commits-src-all@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 4f69p72G3Rz6RRtH for ; Thu, 05 Feb 2026 08:47:27 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f69p71lHPz3WPB for ; Thu, 05 Feb 2026 08:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770281247; 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=TClFPcO3et2ZvVfXN0ZIU3sVPQcdK2aYXMmwZjC81tE=; b=DpWcCVAoaFdHX8a/A8Cb0OiBz8fsHPxdNMWgMUOQSaRABm5Orv68j7HfTwL5XtwIlbQ+B7 5j6dmPgloDpXM+0v0uBqFRBTdWsgV8BOQTLquRly8x6dsyNgsNhI+kA0eXN0KlkrVd+XhS VyX/+XKviCR9GIMsOuKx+hN2HS7JybG8pTmKWVP9qq4Jyoo/442RL0m/h1LSWZuovD2D/N Zdqf0s0AdNtoPV5udBl6xBVcIIn9UNHnoh7mCsCd7YECZXVIEn94pTot2u5HIPT+VJtkjd gtQK9f5XFOwGuRMNqrn3LOSx7Kj0WdpXW/2tC7y3t5CV2/Lm7Wc7GrP0UOtHkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770281247; a=rsa-sha256; cv=none; b=Py7zjbmG1FZY8Vde3FFaoYBw4U4Wu5kPwKx8xmFahNRgxR4YeUObaY4fe6S9nlpTWk+xWq zByqwoSDiwG0R6RV0fssUUkDuEcu6aj0h4f92GOdacrOla1lJtRfiGC62+gRg5rs9uUVX+ geBbS6PcGHql5OPA5UrT9EkcVLZaxEEJ7Umj5vcEf/fLn5uhWZfkPDw/omaRSuuP3UFQLt LgqEs3AEVzyjp0sMy/oP50eI+FITmnx+7RRjbiGYwKGCs68Biy4Cwx5lwV4QdJ1FVkzWiz 3/FXQLbVVhRvwdV7XGLK+ZSSYamID5T63aJ8r7Gv3tRLfYXZbXUQjn2pQFATRA== 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=1770281247; 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=TClFPcO3et2ZvVfXN0ZIU3sVPQcdK2aYXMmwZjC81tE=; b=n36+qvrfp9CYQTeo5AZqGLv5bsFNOKuJZsauc+EEKS2zFBsYDUE93fa6Bmep0vvjSNob8d uFuwKXau/1SUAoPqhpPUPpkQ8dUxCPqAT2kWWVN3KJDGeMRYKJsOG5FkVazmU1Ja5iE8X2 irs8VRmJ3tYad5hovY078x02cXa0DTGjqqD10/u9GHa0dRMAUKUAibZAorbrLFTrJd5aa3 an+YjqpgLSPLXrm979qNJabTyT0KPh2tcV2w4BibMv80pRxv6FW3Zg5fdgZAj+DuoQkiVK c3Q7bu9Zk5p5jX3eoQqgQizKc7Wir/Z6B2cqoO6vj+LMZnTJBkdmrHPyxMGddQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f69p711bJz6WD for ; Thu, 05 Feb 2026 08:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d4cd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 08:47:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: edde7a7a9313 - stable/14 - loader: Prefer comma-separated list of values for "console" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: edde7a7a9313c0590d8a371d9336ae2cc7369e62 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 08:47:27 +0000 Message-Id: <6984591f.3d4cd.617c9574@gitrepo.freebsd.org> The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=edde7a7a9313c0590d8a371d9336ae2cc7369e62 commit edde7a7a9313c0590d8a371d9336ae2cc7369e62 Author: Michael Osipov AuthorDate: 2026-01-28 09:02:33 +0000 Commit: Michael Osipov CommitDate: 2026-02-05 08:47:13 +0000 loader: Prefer comma-separated list of values for "console" PR: 292595 Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D54923 (cherry picked from commit 56970c3c4b0bc61d972837661a31cc2b9e8e8d7c) --- release/tools/azure.conf | 2 +- release/tools/openstack.conf | 2 +- stand/efi/loader/main.c | 4 ++-- stand/i386/loader/main.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 9e698b93fa91..17d78ab8c2b7 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -44,7 +44,7 @@ autoboot_delay="-1" beastie_disable="YES" loader_logo="none" hw.memtest.tests="0" -console="comconsole efi vidconsole" +console="comconsole,efi,vidconsole" comconsole_speed="115200" boot_multicons="YES" boot_serial="YES" diff --git a/release/tools/openstack.conf b/release/tools/openstack.conf index eed0bf62da3a..819752fd6044 100644 --- a/release/tools/openstack.conf +++ b/release/tools/openstack.conf @@ -33,7 +33,7 @@ vm_extra_pre_umount() { echo 'autoboot_delay="-1"' >> ${DESTDIR}/boot/loader.conf echo 'beastie_disable="YES"' >> ${DESTDIR}/boot/loader.conf echo 'boot_multicons="YES"' >> ${DESTDIR}/boot/loader.conf - echo 'console="comconsole vidconsole"' >> ${DESTDIR}/boot/loader.conf + echo 'console="comconsole,vidconsole"' >> ${DESTDIR}/boot/loader.conf echo 'comconsole_speed="115200"' >> ${DESTDIR}/boot/loader.conf # Reboot quickly, Don't wait at the panic screen diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index ccde939581fc..1df1547f23b8 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -1118,10 +1118,10 @@ main(int argc, CHAR16 *argv[]) setenv("console", "comconsole", 1); break; case VID_SER_BOTH: - setenv("console", "efi comconsole", 1); + setenv("console", "efi,comconsole", 1); break; case SER_VID_BOTH: - setenv("console", "comconsole efi", 1); + setenv("console", "comconsole,efi", 1); break; /* case VIDEO_ONLY can't happen -- it's the first if above */ } diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c index e7a42c194326..5a2e98b9046a 100644 --- a/stand/i386/loader/main.c +++ b/stand/i386/loader/main.c @@ -148,9 +148,9 @@ main(void) bi_setboothowto(initial_howto); if (initial_howto & RB_MULTIPLE) { if (initial_howto & RB_SERIAL) - setenv("console", "comconsole vidconsole", 1); + setenv("console", "comconsole,vidconsole", 1); else - setenv("console", "vidconsole comconsole", 1); + setenv("console", "vidconsole,comconsole", 1); } else if (initial_howto & RB_SERIAL) { setenv("console", "comconsole", 1); } else if (initial_howto & RB_MUTE) {