From owner-dev-commits-src-all@freebsd.org Thu Jun 17 21:26:14 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 19B9D65DC6B; Thu, 17 Jun 2021 21:26:14 +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 4G5ZqT74pKz3ttT; Thu, 17 Jun 2021 21:26:13 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DAEF816A4F; Thu, 17 Jun 2021 21:26:13 +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 15HLQDRB028169; Thu, 17 Jun 2021 21:26:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15HLQDZx028168; Thu, 17 Jun 2021 21:26:13 GMT (envelope-from git) Date: Thu, 17 Jun 2021 21:26:13 GMT Message-Id: <202106172126.15HLQDZx028168@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 6a836ea741c7 - main - config(8): Remove obsolete 'config' directive. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a836ea741c71fe3cfd2b09396cb358e9cd89d1d Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2021 21:26:14 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6a836ea741c71fe3cfd2b09396cb358e9cd89d1d commit 6a836ea741c71fe3cfd2b09396cb358e9cd89d1d Author: Warner Losh AuthorDate: 2021-06-17 21:14:16 +0000 Commit: Warner Losh CommitDate: 2021-06-17 21:17:18 +0000 config(8): Remove obsolete 'config' directive. The "config" line in config files has been obsolete since FreeBSD 4.x when we moved to having the boot loader pass in the root device. Remove it. MFC After: 1 week Sponsored by: Netflix --- usr.sbin/config/config.5 | 12 ------------ usr.sbin/config/config.y | 9 --------- usr.sbin/config/lang.l | 1 - 3 files changed, 22 deletions(-) diff --git a/usr.sbin/config/config.5 b/usr.sbin/config/config.5 index dd3ee8baffee..433194f3b22b 100644 --- a/usr.sbin/config/config.5 +++ b/usr.sbin/config/config.5 @@ -402,18 +402,6 @@ Options specific to architecture are specified in the file .Pa sys/conf/options . Ns Aq Ar arch . .El -.Ss Obsolete Directives -The following kernel configuration directives are obsolete. -.Bl -tag -width indent -.\" -------- CONFIG -------- -.It Ic config -This directive was used to specify the device to be used for the root -file system. -From -.Fx 4.0 -onwards, this information is passed to a booting kernel by -.Xr loader 8 . -.El .Sh FILES .Bl -tag -width ".Pa sys/conf/Makefile. Ns Ar arch" -compact .It Pa sys/compile/ Ns Ar NAME diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y index 3d517c2b789e..0ffeb653d722 100644 --- a/usr.sbin/config/config.y +++ b/usr.sbin/config/config.y @@ -203,15 +203,6 @@ Config_spec: STAILQ_INSERT_HEAD(&hints, hint, hint_next); } -System_spec: - CONFIG System_id System_parameter_list { - errx(1, "%s:%d: root/dump/swap specifications obsolete", - yyfile, yyline); - } - | - CONFIG System_id - ; - System_id: Save_id { newopt(&mkopt, ns("KERNEL"), $1, 0, 0); }; diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l index f83af3b5d9cc..ed0b2aa794b3 100644 --- a/usr.sbin/config/lang.l +++ b/usr.sbin/config/lang.l @@ -62,7 +62,6 @@ struct kt { const char *kt_name; int kt_val; } key_words[] = { - { "config", CONFIG }, { "cpu", CPU }, { "nocpu", NOCPU }, { "device", DEVICE },