svn commit: r307322 - head/sys/boot/common

[Warner Losh]

Author: imp
Date: Fri Oct 14 16:05:44 2016
New Revision: 307322
URL: https://svnweb.freebsd.org/changeset/base/307322

Log:
  The file /boot/boot.conf existed for the 3.0 release (r38764). It was
  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

Modified:
  head/sys/boot/common/interp.c
  head/sys/boot/common/loader.8

Modified: head/sys/boot/common/interp.c
==============================================================================
--- head/sys/boot/common/interp.c	Fri Oct 14 15:53:48 2016	(r307321)
+++ head/sys/boot/common/interp.c	Fri Oct 14 16:05:44 2016	(r307322)
@@ -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);
 

Modified: head/sys/boot/common/loader.8
==============================================================================
--- head/sys/boot/common/loader.8	Fri Oct 14 15:53:48 2016	(r307321)
+++ head/sys/boot/common/loader.8	Fri Oct 14 16:05:44 2016	(r307322)
@@ -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