From nobody Thu Jan 29 08:45:02 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 4f1t4b2JMqz6Q879 for ; Thu, 29 Jan 2026 08:45:03 +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 4f1t4Z6t4sz3DHr for ; Thu, 29 Jan 2026 08:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769676303; 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=BYxKNLV8MYisJH+YQ4bmQWKD7hLcOrIjd3UyOjduFag=; b=iLoWHD8qnHpQTIBVikRyH1sowZNlgrr5zjHHRPRLFpOFV+ucYQ/47TWnMx1rQoBwXW3BVP NapLPtR9VkYXRTvBuCypE0vO63gIV76HdzqkKu3Vn2QbginYg0ajppqjKnO9GdaUVYBZ6d ToNR633SiLDdnpJM56R3jBO7FBgHZx1GuN9QWBiJpbH5NRuwPcPYmynoJe42eaA5+2mDtY VzLXlrSgixf1Piepn41TypVClN3gHALC9jNl6GnmQqgTSC+K792vi5h7HqW/l+GPs0r/M3 pBFdpzElvjjUbkk58m8MhS7pAuSsxsXO2gT+ChgIzm5fTyci7NnA/gJBAhJSYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769676303; a=rsa-sha256; cv=none; b=EMtXxvVCfNGMgNAyA3uozSuZoT3Ym/k3ywebH8EZT6wBuc2jjeceIHL2dFrg+0NfW7fypk mjkAqKRVPOB5Xnu3jkDeT07YgsdvhoEDsML1a6z/gwARW9fUi3NNUTWAnzgA5VZ6SjJtAD vMXrh95LWvTGX/iOVumLaKC6Cg7/6OcSp/PwycZoM0i0RY3g676iUStlvK2AiS1HCgfuW2 L0ae8IWnwAy7piMYu+0JjOROpcf3BxXLa3gm7tftMpZ3jQbmm4TdNaL7EpIR8tRzD/FiC0 dQFIML8QuR3Ow/GqI+Akknq6khSM3jt3woKi6y/fBLndR2O+mMegRREgMZ31zA== 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=1769676303; 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=BYxKNLV8MYisJH+YQ4bmQWKD7hLcOrIjd3UyOjduFag=; b=i8rcbuixz54yNTv0nlIqVpED4DcNkTr5PsR7313howwrI0Tnaqq85q1qtKSbhgiM38GS2Y /F00L4Z2pSKBU9P+RY6E+wKBp4spIaOAJn7mwux9l/hOAqG+elhKYS3oXRd9RwWp7px2nX XWRMGyDN5WMM9RN/Q55AYmTUiJEn2t94rJm4kWdPkk82jg4IyMBZMMB5izd7w6XTJEUFRf bdmU5WAF6GyGCdawCzQ3/ghMsCOhfLGW9cQI13+XxbWS3NAD4MNfKo26wpyVN/hvh4MHOE GqnY1zxTWKLqmdJpry6IcKloGLVZdnpG+RmUObKrXKLC9XvKKMz4T3edIct3Sw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f1t4Z5WdKzX1b for ; Thu, 29 Jan 2026 08:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27b69 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Jan 2026 08:45:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: 56970c3c4b0b - main - loader: Prefer comma-separated list of values for "console" 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 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/main X-Git-Reftype: branch X-Git-Commit: 56970c3c4b0bc61d972837661a31cc2b9e8e8d7c Auto-Submitted: auto-generated Date: Thu, 29 Jan 2026 08:45:02 +0000 Message-Id: <697b1e0e.27b69.ae3352c@gitrepo.freebsd.org> The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=56970c3c4b0bc61d972837661a31cc2b9e8e8d7c commit 56970c3c4b0bc61d972837661a31cc2b9e8e8d7c Author: Michael Osipov AuthorDate: 2026-01-28 09:02:33 +0000 Commit: Michael Osipov CommitDate: 2026-01-29 08:44:45 +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 --- 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 981e40566a1c..4fa6ba4d924d 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -59,7 +59,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 9ce65a75c3c5..6cfb02bab9af 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 22dbd10a0f37..7ff2cf188509 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -1316,10 +1316,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 a70b3a253b90..7538c6d4fb3f 100644 --- a/stand/i386/loader/main.c +++ b/stand/i386/loader/main.c @@ -162,9 +162,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) {