From b61a75085e65b9e120f5928a42b9be6b7a27b961 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 14 Oct 2016 16:05:44 +0000
Subject: [PATCH] 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
---
 sys/boot/common/interp.c | 3 +--
 sys/boot/common/loader.8 | 8 +-------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/sys/boot/common/interp.c b/sys/boot/common/interp.c
index a683847945ce..f4117b9b3e58 100644
--- a/sys/boot/common/interp.c
+++ b/sys/boot/common/interp.c
@@ -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);
 
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index 7dff914d6407..55cbad4b1dae 100644
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -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