From nobody Mon Dec 16 15:14:43 2024 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 4YBk4z6350z5hYMH; Mon, 16 Dec 2024 15:14:43 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YBk4z2jK4z46Qb; Mon, 16 Dec 2024 15:14:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734362083; 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=c2YRQO7+pjTuiAxpPZaP8mNPtiF7WsVjyR9VIXewpmQ=; b=KFdfqb8pUUV5n37UZvQlgzCcPWudxfGuXQCKVNwaOMPOjIlE3nkngG8/DLFdu+IL3Y5ED7 zhAgDMW8biwR/YWrWDhWjOTSTK9pJwbC5qDFL5h8xYUSnkGuVHAuoSNNpIY68dA3ONvh5K /ojO1B6GYaSgkwicsIpulvsbybSXs/DvdTdjWIIelE+SC3/D6RDdn4ethE/nKTfPHqNdIG J7FM84xZPT4wFTpjmBFS9UNnknT+IhaIM/VcD0rRFLnC7fT4S+CcXxQI8h+e79uW2oq4Ui /ROkPFW3Awgn9hCwdC9ctfgXRpp05qg/0scnW/IrbgoM1q9I8WioYWXvobIaMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734362083; 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=c2YRQO7+pjTuiAxpPZaP8mNPtiF7WsVjyR9VIXewpmQ=; b=pCrUdqfLSOxdSREdL5LqUw/jWQnnJX7iOqBGzOKSGeSqH/oSqMck7tGm5jX6fpsaU3CAT5 dfGWu+Os0NhZnAItSP1wIEjdGA7q8HUxoTdkD1SLGCRgME0IxvNQn/KVaR5H95fbxDuzua 6rKp+Zdl4n8yPh0jICSC4MOzM+RY578C+wDYO9otMR70mRzTeRT+4+nJrH82BQd2jpya+s Lx2T3PjIhGixylLDfZo1drJeVF6hdam6pRnelnJ5HMr0h20U3s7TIXsmVs3TJTbpXQ3QaJ UxV98Lk36YYtrL4dd5V5s7f9Mx7JZvOKnW9zUtUdBV8OgC4oSd7fwBA4g86nPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734362083; a=rsa-sha256; cv=none; b=xpUjjIzScle+VC0WvPU9QBaesqQ8r4MD/52kWYuFjq5YcL3GCMAHp9NHkwsgDWqFiP8H91 CA/C8kxh4bKCpNe05w12VCI20jqsYcF312wtud8I9lM6ZGP+u1Y0Uzd99xZ7zSfulnwNox so/mSF0iVXAXRad+EHyNM0NuHFfpnGaDxtNcj+BfFGTcf4jqXedpDvCECCP+afK/0UCyfb G75zIgDIhq2b+WiCWUgDDcZILduQ/BcVp/Zxy+t6u9vYYii6rEhwCGmJy6/RKwlnvwo5Xc SS89cSbYDjH3+skOixVaHLdy0O8CFk3p6rxuU3dN+/aIl6LEM8w4TS3oaD8OXw== 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 4YBk4z1yYrzyDN; Mon, 16 Dec 2024 15:14:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BGFEhxT011323; Mon, 16 Dec 2024 15:14:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BGFEh2O011319; Mon, 16 Dec 2024 15:14:43 GMT (envelope-from git) Date: Mon, 16 Dec 2024 15:14:43 GMT Message-Id: <202412161514.4BGFEh2O011319@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 7f50357e0d8b - stable/14 - nanobsd: Fix cust_comconsole search patterns 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7f50357e0d8b7cfbc937701cd9715ba8d824d26b Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=7f50357e0d8b7cfbc937701cd9715ba8d824d26b commit 7f50357e0d8b7cfbc937701cd9715ba8d824d26b Author: Jose Luis Duran AuthorDate: 2024-11-15 04:28:01 +0000 Commit: Jose Luis Duran CommitDate: 2024-12-16 15:12:15 +0000 nanobsd: Fix cust_comconsole search patterns The current patterns are outdated, and may produce "offifexists", after e310437971b8 ("For video consoles, only launch a getty if the device exists."). Fix the expressions to: 1. Disable getty(8) on the virtual syscons(4) or vt(4) terminals (/dev/ttyv*). 2. Enable the use of the first serial port as the system console. Reviewed by: imp Approved by: emaste (mentor) MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D47586 (cherry picked from commit 0f7b0db5dd07e7c48285db4cac19e15fc9a42622) --- tools/tools/nanobsd/defaults.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 119c632b328d..587df09f0f3f 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -742,10 +742,10 @@ UsbDevice ( ) { cust_comconsole ( ) ( # Enable getty on console - sed -i "" -e /tty[du]0/s/off/on/ ${NANO_WORLDDIR}/etc/ttys + sed -i "" -e '/^tty[du]0/s/off/onifconsole/' ${NANO_WORLDDIR}/etc/ttys - # Disable getty on syscons devices - sed -i "" -e '/^ttyv[0-8]/s/ on/ off/' ${NANO_WORLDDIR}/etc/ttys + # Disable getty on syscons or vt devices + sed -i "" -E '/^ttyv[0-8]/s/\ton(ifexists)?/\toff/' ${NANO_WORLDDIR}/etc/ttys # Tell loader to use serial console early. echo "${NANO_BOOT2CFG}" > ${NANO_WORLDDIR}/boot.config