Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 May 2023 20:06:48 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 82cf061eba45 - main - stand: Make non-matching console names OKer
Message-ID:  <202305112006.34BK6mPB019537@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=82cf061eba45fa56b2ed97998e08943da8159f56

commit 82cf061eba45fa56b2ed97998e08943da8159f56
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-05-11 20:03:37 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305112006.34BK6mPB019537>