From nobody Thu May 11 20:06:48 2023 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 4QHNG06Mb9z49xCF; Thu, 11 May 2023 20:06:48 +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 4QHNG03v2yz3nY5; Thu, 11 May 2023 20:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835608; 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=ZumQpYGTmSk1I/VP8n2S36h37vQmtiHJ4TyjibbcNpc=; b=XgUpXdSgBr/XRr4TMnVO4jV7y121jJFG5fe7es7SOmGs8+e2ksQNGJ2OsSfT9No9yExsoE vEm4YFr9lTzRuzHQoVJQ4XkSL2zwj+KiA0N7dGvjOy8RwjVbDSb2w5stc+8oQAbBbZwhdL wRPrHssd1noPrtQGn0XiXuPiGUvmLqj+Nl1+e3iK4Sb6UFHI2eBUeA5WLqajZ93onIQPIm GVctyX1BUjAWn7IU33I73Q/aKM1rHVusyFMVSBiM16etPEW/fniT4EKNa+yqRWihTYXLIl TG/lZsdIXaHsqyg1W4i4M+yYJNFx0FhZK7u3J8kSxGjdKzIhtxN5SHL+DTyaHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835608; 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=ZumQpYGTmSk1I/VP8n2S36h37vQmtiHJ4TyjibbcNpc=; b=eUDLSUq1yZyNVXzhE8HLT01UdYSQlHUl60ZGHGdCfBJnz/UVUc6P7FZCBUuHIxK9ge28Fa sCIM5GHwv/sqkEOy7DhskdTEApM5kkNyiTnYK1e9WHQRWtjm2yXUXV2BMGUATasb8xBDEX hlafTUiaGLNiptwFIsrlEvFnlFrHn6QyKgby9W2dLmXyw8143cSDhV/eHyvO3c48gynihy rwQmIpygNPMsVIma6l34Qtv3pucIE0Ytc+CAnqH4js/9qW/NowEvOA5OYfcS1290CvXIt9 kG3zsegLPVnESdU7ydIhLhE23zRlPrxCLMMEniskpnyZF6BS+zFIo6rO/J5H/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683835608; a=rsa-sha256; cv=none; b=l/el5qksAbzupzicbMZwkV4fElDJ3b+jJeYMSviK+n/t7CtMFfh/euN/OfrTHPeEZk2ED0 rx4czTDM5FJbNheApdh4d81TMROIlAkiNHaJAXWrKeWB/iHC0lM37AZzEAuTla967pyY44 oOvXlQRPRlKsgkTIKroTpozvcBAVW8mrsMoUVL0O4kViMgQTvdY173Zf6ma5jm1ody3rqT YGZMu6xPmEQNHHQrWv0VB41Oh+Qwx5o/TXq6f3zfta+RB5iIEePC2KDsFJsQJbVNTjZ9Pj XZpvL3f8iQbtrDIF7CJWvfKAgqNkVXJUb/z8CGEdSsFz5pUTADrZXwfhYRTVPg== 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 4QHNG02lCFz15l4; Thu, 11 May 2023 20:06:48 +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 34BK6mDX019538; Thu, 11 May 2023 20:06:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BK6mPB019537; Thu, 11 May 2023 20:06:48 GMT (envelope-from git) Date: Thu, 11 May 2023 20:06:48 GMT Message-Id: <202305112006.34BK6mPB019537@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 82cf061eba45 - main - stand: Make non-matching console names OKer 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82cf061eba45fa56b2ed97998e08943da8159f56 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=82cf061eba45fa56b2ed97998e08943da8159f56 commit 82cf061eba45fa56b2ed97998e08943da8159f56 Author: Warner Losh AuthorDate: 2023-05-11 20:03:37 +0000 Commit: Warner Losh CommitDate: 2023-05-11 20:06:03 +0000 stand: Make non-matching console names OKer Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D39984 --- stand/common/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/common/console.c b/stand/common/console.c index 0e8afb477ee8..ae1bb7c9f952 100644 --- a/stand/common/console.c +++ b/stand/common/console.c @@ -238,7 +238,7 @@ cons_check(const char *string) if (*curpos != '\0') { cons = cons_find(curpos); if (cons == -1) { - printf("console %s is invalid!\n", curpos); + printf("console %s is unavailable\n", curpos); failed++; } else { found++; @@ -251,7 +251,7 @@ cons_check(const char *string) if (found == 0) printf("no valid consoles!\n"); - if (found == 0 || failed != 0) { + if (found == 0 && failed != 0) { printf("Available consoles:\n"); for (cons = 0; consoles[cons] != NULL; cons++) printf(" %s\n", consoles[cons]->c_name);