From nobody Thu Feb 5 08:56:36 2026 X-Original-To: dev-commits-src-branches@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 4f6B0j0s3lz6RSSZ for ; Thu, 05 Feb 2026 08:56:37 +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 4f6B0h4dDZz3XlQ for ; Thu, 05 Feb 2026 08:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770281796; 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=pTvuf0YOUQejPrkNuuglmfAcFIIRe1mjpUMXhmFMksY=; b=Rw4fpYDUi6vS007tTKDb/Kc+R/02oryk+Fkmv/M8nF1u2oittdN0tzI25dzXvSqr4lQJfN 0K6v5adpaZdOTE7VsMsNQYUg3QvDYFYJ5xEdgywZ9yQMUV5YqZm7KYMYxlErBkwVPMxNJi u5ljWUrVRBHdju+qh2Y1C0DKF/khMqfAf9Jht/TcvVMx/xWOoHDFlUENGlsgrAQiAvjvt4 Gcenb6+xeMvyexHWqaN2TFgI98Afr/ruiErFhj5T5uv0Ti013oRcuoBx/ebdFrSA4CbihO FjofW3WyIjlFs93Eqe0IGjumIfVbLP8eCqumefq0BlJ1A7PvRGIx4zdloNogaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770281796; a=rsa-sha256; cv=none; b=k4Yh4xfzHbxMEzWnPdP69FhkT5hY3pY54c+32OO1BTXYYElzB9xZAaUHKCXntaKpq2w3vA x2oZMkfSLe/+TgUmhdu/yf22dvhJ0JNMTyjBbB/IAcq+aG5zMTMIkwM7qul++5hfbEdA3M RnSut6b3RDhA+LQPwcakkNndyF/uFwW0G8SFchtr65GMzy+4GkQZ6VImzqdQMIHtGbjCPJ T0Tc9LBLaVrUQyZEIW9tVmUQpBDEBiPRsxMMVAyk3TVSsy+DHT8RizSZjZ7c/FyQqiOk6D gYrpG94aRFo9q2/03wPBs/YP7No1FAT9NY3/xsFADCujF1vH3bx1o0cFTbOKjg== 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=1770281796; 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=pTvuf0YOUQejPrkNuuglmfAcFIIRe1mjpUMXhmFMksY=; b=UrHwyMAkko4a0SBmXcrgLaRUUxI7j8Ss3iqOo80E8z9PlBOJrjyfdkYRCPs2b/zFfXnKh3 SKHlePHCdHBRxFz8ne6MrnqOj/nboKUgg8RrZ9aTC6kP/a/iPo85nDzQhfxLf+YT74vglL 5RsOp4+LYE2no4M/YYPxMmSXSnjFfxdvOXEWribvknEqXaGxUzGMlR013LKas7THrfglUj jACR7EVOwDUymlWO8ux82KkA4k0Ib7ceBO3k4z10FPINu6E6FPBlU++OZLE1ElzYitAGjD 5sAqGNqujqEs2dJBuYUwwiqGJMTSvs/9zvxdoNUz+UP16KR8ZHYhOzewQ4+Sxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6B0h3h49z7CF for ; Thu, 05 Feb 2026 08:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e339 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 08:56:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 93fbf353b62c - stable/13 - loader: Prefer comma-separated list of values for "console" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 93fbf353b62c02cebd42e08e1ed97225fe526447 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 08:56:36 +0000 Message-Id: <69845b44.3e339.4c1e7a38@gitrepo.freebsd.org> The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=93fbf353b62c02cebd42e08e1ed97225fe526447 commit 93fbf353b62c02cebd42e08e1ed97225fe526447 Author: Michael Osipov AuthorDate: 2026-01-28 09:02:33 +0000 Commit: Michael Osipov CommitDate: 2026-02-05 08:55:28 +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 aa284b150c25..5bb4c0839beb 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -19,7 +19,7 @@ vm_extra_pre_umount() { echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf echo 'ifconfig_hn0="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf echo 'waagent_enable="YES"' >> ${DESTDIR}/etc/rc.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 rm -f ${DESTDIR}/etc/resolv.conf diff --git a/release/tools/openstack.conf b/release/tools/openstack.conf index 4c905fbae4ba..d927c9efcf79 100644 --- a/release/tools/openstack.conf +++ b/release/tools/openstack.conf @@ -41,7 +41,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 e8a5b738aef9..0330ab15db9a 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -1041,10 +1041,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 aecc45352ad7..28c1af05dee6 100644 --- a/stand/i386/loader/main.c +++ b/stand/i386/loader/main.c @@ -150,9 +150,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) {