Date: Thu, 17 Jun 2021 21:26:13 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 6a836ea741c7 - main - config(8): Remove obsolete 'config' directive. Message-ID: <202106172126.15HLQDZx028168@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6a836ea741c71fe3cfd2b09396cb358e9cd89d1d commit 6a836ea741c71fe3cfd2b09396cb358e9cd89d1d Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2021-06-17 21:14:16 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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 },
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106172126.15HLQDZx028168>