D8142.1793744879.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D8142.1793744879.diff
View Options

	Index: head/sys/boot/common/interp.c
	===================================================================
	--- head/sys/boot/common/interp.c
	+++ head/sys/boot/common/interp.c
	@@ -104,8 +104,7 @@

	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);

	Index: head/sys/boot/common/loader.8
	===================================================================
	--- head/sys/boot/common/loader.8
	+++ head/sys/boot/common/loader.8
	@@ -90,9 +90,7 @@
	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 @@
	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