From nobody Sat Nov 16 07:23:49 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 4Xr53V3sMhz5cyRN; Sat, 16 Nov 2024 07:23:50 +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 4Xr53V16Q2z4fym; Sat, 16 Nov 2024 07:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731741830; 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=Vq6MtKox6H53kMXRpoEEE4IOzCBlvE28XXTYVOO8d6c=; b=nywrsD28wxoDXZbBBaws/ZWAsy2BY4X3u82ExpNmMtMYJpNqbg8MqJNg5Z6gvUby2g1DQP hOeHqbbtUMRKeiMvmI9d0dedrGXYza8Hy2gsxUlvyi6hzJpXaJB3R6ACJvVyLD2h/ZMWMc BPQMLLGHv5gvrHDetkmOYdQ67YIe/Fxzcc47EPAr9isRjZH9x9YESTvaEcZ4LYHvHzQR/6 6HtXbIpGKIo78LJr4SzKks5M6tnOhjVQTZuTPAs1YVLxQlxC4CvoefNidjhKPXTcCQzBlc TUgXDAEPHcBqQZMIV9DCmfGrO+0xEV9Lypa8DcQWrlpXHg4SfyLwrO8U1abWUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731741830; 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=Vq6MtKox6H53kMXRpoEEE4IOzCBlvE28XXTYVOO8d6c=; b=seDkm0c4JLBLImJTPCYyjCiUZ52F/qg199UoznDytiIvqhCS8l/HrW5Ck8E8HQQT/dzDno Oiq56H9G4hjebEdgMMvi/MMqrpFcIgnMSRZZczGCMvDajei5koRn2w+AQo7RhUqk7c5XUN a5ajNDJzpad/FLTOz34t2cdLxN37LnwaOtyuw2mqeS/u5kpTZ5CJs8QmGiuWAjhShRc8zt hBMicfnev0gRZWVP3gycJ2pcap4KdEf5B6EBr+eNCpaE5MLq0lcE6G4ILGKTkGjKreqiRc iGXh0lFg0QCBf5zsTICoYrxXxL+2On2eqbY9DhknrDRtBX6GtSGv0L4lbg/Zyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731741830; a=rsa-sha256; cv=none; b=ydJ4v9CqHmrc0NAqFf0NTcECk3S+W8R4be9tAveaPRwwO6l8oi6M35O6K/xLW7etiexOo9 ET3Fkm3KWDXQ4Z1hCsbNllHiPjovZ6FSw+F2Sp6k1+svZayQv1+RVzYMDdsuyl4xygtJ9O kuB+G6/2YJL85GF/mELbPF7YSsR+8slIA0bGpKrLiY+7M/+3UoLVHg0zkTm5RmfdH5hMbm trQqZEk0M26jXJuxgbFdjHkOcGjRU0rU3mUly6t0JKuApWk5kzTjtUtrx1RaaGFft9Xwym IXUlmrzS70Ydm2SsAV0pxji8nJLgZd1TevnUwGomQXYnza3DriNXc96o7hs2vQ== 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 4Xr53V0fZkzxqr; Sat, 16 Nov 2024 07:23:50 +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 4AG7Nnvi018586; Sat, 16 Nov 2024 07:23:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AG7NnnO018583; Sat, 16 Nov 2024 07:23:49 GMT (envelope-from git) Date: Sat, 16 Nov 2024 07:23:49 GMT Message-Id: <202411160723.4AG7NnnO018583@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 0f7b0db5dd07 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 0f7b0db5dd07e7c48285db4cac19e15fc9a42622 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=0f7b0db5dd07e7c48285db4cac19e15fc9a42622 commit 0f7b0db5dd07e7c48285db4cac19e15fc9a42622 Author: Jose Luis Duran AuthorDate: 2024-11-15 04:28:01 +0000 Commit: Jose Luis Duran CommitDate: 2024-11-16 07:08:24 +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 --- 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 1e38a07337c7..5cb137a1db94 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