From b6955dfd9235163d341fca1234b8bf82bef8f168 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 26 Feb 2018 03:16:47 +0000
Subject: [PATCH] Go back to one loader.conf

We really only need one loader.conf. The other loader.conf was created
because the current one took forever to parse in FORTH. That will be
fixed in the next commit.
---
 stand/Makefile                          |  1 +
 stand/arm/loader/loader.conf            | 13 -------------
 stand/defaults/Makefile                 | 12 ++++++++++++
 stand/{forth => defaults}/loader.conf   |  0
 stand/{forth => defaults}/loader.conf.5 |  0
 stand/forth/Makefile                    |  4 +---
 stand/mips/uboot/loader.conf            | 13 -------------
 7 files changed, 14 insertions(+), 29 deletions(-)
 delete mode 100644 stand/arm/loader/loader.conf
 create mode 100644 stand/defaults/Makefile
 rename stand/{forth => defaults}/loader.conf (100%)
 rename stand/{forth => defaults}/loader.conf.5 (100%)
 delete mode 100644 stand/mips/uboot/loader.conf

diff --git a/stand/Makefile b/stand/Makefile
index 64ec1a48a6b..242eb4c5297 100644
--- a/stand/Makefile
+++ b/stand/Makefile
@@ -13,6 +13,7 @@ SUBDIR+=		liblua
 SUBDIR+=		lua
 .endif
 
+SUBDIR+=		defaults
 SUBDIR+=		man
 
 .include <bsd.arch.inc.mk>
diff --git a/stand/arm/loader/loader.conf b/stand/arm/loader/loader.conf
deleted file mode 100644
index dd2a23a971d..00000000000
--- a/stand/arm/loader/loader.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# This is defaults/loader.conf for ARM, containing defaults for loader(8).
-# Do not modify the contents of this file, instead put your customizations
-# into /boot/loader.conf or /boot/loader.conf.local
-# $FreeBSD$
-
-autoboot_delay=10
-bootfile="kernel"      # Kernel name (possibly absolute path)
-kernel="kernel"        # /boot sub-directory containing kernel and modules
-loader_conf_files="/boot/loader.conf /boot/loader.conf.local"
-module_path="/boot/kernel;/boot/modules;/boot/dtb;/boot/overlays"
-nextboot_conf="/boot/nextboot.conf"
-nextboot_enable="NO"
-verbose_loading="NO"
diff --git a/stand/defaults/Makefile b/stand/defaults/Makefile
new file mode 100644
index 00000000000..3dfe1d36ba2
--- /dev/null
+++ b/stand/defaults/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+NO_OBJ=t
+
+.include <bsd.init.mk>
+
+FILES+=	loader.conf
+FILES+= loader.conf.5
+
+FILESDIR_loader.conf=  /boot/defaults
+
+.include <bsd.prog.mk>
diff --git a/stand/forth/loader.conf b/stand/defaults/loader.conf
similarity index 100%
rename from stand/forth/loader.conf
rename to stand/defaults/loader.conf
diff --git a/stand/forth/loader.conf.5 b/stand/defaults/loader.conf.5
similarity index 100%
rename from stand/forth/loader.conf.5
rename to stand/defaults/loader.conf.5
diff --git a/stand/forth/Makefile b/stand/forth/Makefile
index acb5842b898..52166f23d2b 100644
--- a/stand/forth/Makefile
+++ b/stand/forth/Makefile
@@ -9,7 +9,6 @@ MAN+=	beastie.4th.8 \
 	check-password.4th.8 \
 	color.4th.8 \
 	delay.4th.8 \
-	loader.conf.5 \
 	loader.4th.8 \
 	menu.4th.8 \
 	menusets.4th.8 \
@@ -35,10 +34,9 @@ FILES+=	screen.4th
 FILES+=	shortcuts.4th
 FILES+=	support.4th
 FILES+=	version.4th
-FILESDIR_loader.conf=	/boot/defaults
 
 # Allow machine specific loader.rc to be installed.
-.for f in loader.rc menu.rc loader.conf
+.for f in loader.rc menu.rc
 .if exists(${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f})
 FILES+= ${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f}
 .else
diff --git a/stand/mips/uboot/loader.conf b/stand/mips/uboot/loader.conf
deleted file mode 100644
index dd2a23a971d..00000000000
--- a/stand/mips/uboot/loader.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# This is defaults/loader.conf for ARM, containing defaults for loader(8).
-# Do not modify the contents of this file, instead put your customizations
-# into /boot/loader.conf or /boot/loader.conf.local
-# $FreeBSD$
-
-autoboot_delay=10
-bootfile="kernel"      # Kernel name (possibly absolute path)
-kernel="kernel"        # /boot sub-directory containing kernel and modules
-loader_conf_files="/boot/loader.conf /boot/loader.conf.local"
-module_path="/boot/kernel;/boot/modules;/boot/dtb;/boot/overlays"
-nextboot_conf="/boot/nextboot.conf"
-nextboot_enable="NO"
-verbose_loading="NO"