From nobody Mon Oct 03 16:09:40 2022 X-Original-To: dev-commits-src-main@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 4Mh5Px1t8Cz4d5bF; Mon, 3 Oct 2022 16:09:41 +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 4Mh5Px1L9Vz3KYm; Mon, 3 Oct 2022 16:09:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664813381; 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=Zj55qMXmKjrNDHZNQ4VHMPkhBp38GOqNSBkyJETo4Vg=; b=pDOH95dLaE7tA6suL9Pu1olap//Aaqp7VSokG85wIWG/WPybtZE9EHqsnKVekAfiUCMkeM bQyDaJMR2Ruka670GKSWhOEay2vbOHsvBrRrfykjlnScBvrzfa7rOelqTeU2N72Gq1hYth AY3XEemBl72qgu1bPczpOntwFj8MgVq974JOZcJ14AP1IBdPjdk3sV1V8XwgqQEtnZRhHL +sT5+EKlzflyVX6JXLUJeGSy0mH0rwOGQkj7B+FJhohzut35c9clAH8XvYETKG8oigYmTm r0HCBchzE1XGtlNyf1QpDZFC+NrtBfy3gcpHhow3FoqS62l5i41AcdnvFEQXsA== 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 4Mh5Px07X6zFxG; Mon, 3 Oct 2022 16:09:41 +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 293G9eIX022535; Mon, 3 Oct 2022 16:09:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 293G9ed4022534; Mon, 3 Oct 2022 16:09:40 GMT (envelope-from git) Date: Mon, 3 Oct 2022 16:09:40 GMT Message-Id: <202210031609.293G9ed4022534@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: f334df76004d - main - release: Remove remnants of pc98 support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f334df76004da6acb1bbda4ee1864102f40dac2d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664813381; 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=Zj55qMXmKjrNDHZNQ4VHMPkhBp38GOqNSBkyJETo4Vg=; b=vVMK54k/dGN3zElt1AanpjW20zghoYPSOzvxpyl1QNZoGaJTyrC37ayeIuOVrEzYuKLU2b FYfmJYdg5IRH4Izn8acdbbxb3tJXAHevXlkPuIRBLzew7gFckMt05G4QAAAHeD2froPgyH Dj/AumZHG+zAPjwe/DZ1Ym39VcXY+TsXzk0wsgMnocOjEbbbgkfqGywyho0p8x2t3dxeBs 5uQyAsmbFHvjGtQo9LAztUBIqnvObuu25Dyq1bsRtmsgGKiMrIqqV6tHkDN3oJn8E8ITYm ySU4RGEd+EUl0PDgfeWtQhY+7lMYYUqa8A3SOqIV9KFhJ++TFTIJ++fERaMu+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664813381; a=rsa-sha256; cv=none; b=BFhq+1iHaGic8RXUcUs+qWMxWHrvTUYH+ky25dn0+5I5D1oYa3fccbBfysngxoqICryHb9 CVQXEdJGHaDKWldFkYJO1jfunNN20jyTTXT+zVZK41kOBfSFQX4CPNL9YlztXVv4Vsu0tL rSHnzoE0cU+M5FQ4yvUDZ8J6BhR5vXaohZ+xc2t3WZOTzW1V2kiwFF4tlDulEgxgG8ThaX haJEklN1U66Y51EOCj4ADO5s3rQSYC47XJ/nTTeh7gu6VQuWoVhBsHEBaDrKXpORYOiSIE 23sWPxaRL9tCNGuF97TcHQDl8O6HIW6YN5mcnlrnEknrWHpIdKoFrTsWYzDZ/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=f334df76004da6acb1bbda4ee1864102f40dac2d commit f334df76004da6acb1bbda4ee1864102f40dac2d Author: Jessica Clarke AuthorDate: 2022-10-03 16:09:16 +0000 Commit: Jessica Clarke CommitDate: 2022-10-03 16:09:16 +0000 release: Remove remnants of pc98 support The cons25w line was added in c991a6474749 for pc98, along with reading MACHINE in order to determine what terminal type to use for VTYs. Commit 2b375b4edd1b removed this condition, leaving it as always using xterm for VTYs, but left behind the now-unused MACHINE variable and the cons25w list entry. Clean these up to be how they were before pc98 support was added. Note that anyone who really needs a cons25w terminal can still request it, it's just not listed as a common option. Reviewed by: imp, brooks Differential Revision: https://reviews.freebsd.org/D36587 --- release/rc.local | 3 --- 1 file changed, 3 deletions(-) diff --git a/release/rc.local b/release/rc.local index 94f8927989f5..9adaea468ae7 100755 --- a/release/rc.local +++ b/release/rc.local @@ -8,8 +8,6 @@ : ${BSDDIALOG_ESC=5} : ${BSDDIALOG_ERROR=255} -MACHINE=`uname -m` - # resolv.conf from DHCP ends up in here, so make sure the directory exists mkdir /tmp/bsdinstall_etc @@ -40,7 +38,6 @@ else echo " ansi Standard ANSI terminal" echo " vt100 VT100 or compatible terminal" echo " xterm xterm terminal emulator (or compatible)" - echo " cons25w cons25w terminal" echo echo -n "Console type [vt100]: " read TERM