d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The file /boot/boot.conf existed for the 3.0 release (r38764). It was

Browse Source 
replaced by /boot/loader.rc for 3.1 (r42682). In May 2000, this was
documented as deprecated (r61942) (between FreeBSD 4.0 and
4.1). Remove it since it's not been the preferred method in 17 years
and has been deprecated for 16.

Differential Revision: https://reviews.freebsd.org/D8142
This commit is contained in:
Warner Losh 2016-10-14 16:05:44 +00:00
parent 8ff003011d
commit b61a75085e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=307322
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/boot/common/interp.c
View File

@ -104,8 +104,7 @@ interact(const char *rc)
if (rc == NULL) {
/* Read our default configuration. */
if (include("/boot/loader.rc") != CMD_OK)
include("/boot/boot.conf");
include("/boot/loader.rc");
} else if (*rc != '\0')
include(rc);

8
sys/boot/common/loader.8
View File

@ -90,9 +90,7 @@ which is
default.
After that,
.Pa /boot/loader.rc
is processed if available, and, failing that,
.Pa /boot/boot.conf
is read for historical reasons.
is processed if available.
These files are processed through the
.Ic include
command, which reads all of them into memory before processing them,
@ -957,10 +955,6 @@ itself.
Additional
.Tn FICL
initialization.
.It Pa /boot/boot.conf
.Nm
bootstrapping script.
Deprecated.
.It Pa /boot/defaults/loader.conf
.It Pa /boot/loader.conf
.It Pa /boot/loader.conf.local