From nobody Mon Dec 16 15:15:25 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 4YBk5n6D3zz5hYX8; Mon, 16 Dec 2024 15:15:25 +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 4YBk5n55bxz487L; Mon, 16 Dec 2024 15:15:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734362125; 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=paXFknQjk3UoKPmcH4MQJda7v1G3Rdt2vcdcow59wzI=; b=mualEZej26XNHvV9WuFlgsK1h8tWlrigKcVDFgQykJSuSqaafSolZ61BmNWorr98LTMBny Lx4vJLHWplBKdWT4oS7wC/4KCVuna/r3ltn6Dr6298TRPTTRSq8WbkYdzo1DY0NByCuykS 8/KEsB76KV820uY5aCxD9HZfEkyyv1h1WQwOc2yH+dpRynVBFMgKooxVIbKK8fLDSV80Rs 67RuwUKPJN8lWdOWIke1aQ/6ncglPDtIPLzBav9+ZOH9wg+/LcPXVU/rnKUuB6ikM9vUxj tXFdMz1JQHDC7gesxG2jVTmgh3FfG39clHdTVRwjnGsbvY7Jm2BC7M0FJeHC+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734362125; 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=paXFknQjk3UoKPmcH4MQJda7v1G3Rdt2vcdcow59wzI=; b=ROoOGwUyR5e4RilEDSa0mz+jjW/q7R+ansZ90ldudBTXh1/xZrwRHehmbGviq6yyEvRmMW RsUxonI+4UlG7YeGiXRfaXDQSx715uDSezHhg0b2x5cElGqwCYnCBbkZZrk22JVn+XpHky j8cjapwDIXXNMxLxzcTgBZEPXM0erFgjhy6dSJ+wbjRRNzLJDD+zffrvX8FmTqJ9rHrC0n rldGSzbbf2+WnHrZPkLmb4YO+OD+Tz3Xm8Fh777h4XJIPNfrq/PydERD4g0mck3h2etFQw SwY797OI0HCQ5V9izhrSRHqbu5CJl6n906L1kKnRxK3YrJL+5GV2SYfJk184Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734362125; a=rsa-sha256; cv=none; b=Z4GeBC80Ik5OZlMHhqX28rYOOE4A/cbd7JKh63jF/VNXEtHYzF5W4OBsl5uNhJBrndTfO8 U24CfE0qEiKyxllbkVqfJtCr7ZF9cuiOYMrO3hHsMvjDbnLR3rbM/eOtJvn1rTCU8HXRrP mmyy0IyOQt6kUyVbl+/aYaorAsvF69KyLk3M1IR6H9MvC6d+Lpl3QNXe3SGQfD2WiKbij/ gsJ46drD6L5NMW8AuYvJtgxFhGZGENpgfxH9Yxbe08w1QOTujUMWieu/fjbd+4uiTq7LN6 +GYb7kf6zEA7gfxq2ebM1HF0ijyghLvDVLf4mRDlqAX9lkX8usq6wL/dvtJObw== 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 4YBk5n4gNczy4l; Mon, 16 Dec 2024 15:15:25 +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 4BGFFPTW012103; Mon, 16 Dec 2024 15:15:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BGFFP1C012100; Mon, 16 Dec 2024 15:15:25 GMT (envelope-from git) Date: Mon, 16 Dec 2024 15:15:25 GMT Message-Id: <202412161515.4BGFFP1C012100@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: 4ace066a9085 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 4ace066a9085e8b0e9febf7850b3c51cd9533f7a Auto-Submitted: auto-generated The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=4ace066a9085e8b0e9febf7850b3c51cd9533f7a commit 4ace066a9085e8b0e9febf7850b3c51cd9533f7a Author: Jose Luis Duran AuthorDate: 2024-11-15 04:28:01 +0000 Commit: Jose Luis Duran CommitDate: 2024-12-16 15:13:51 +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 69e89958b02b..8ef9cc0a6066 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