D8142.id21004.diff
No OneTemporary
Actions

Size

868 B

Referenced Files

None

Subscribers

None

D8142.id21004.diff
View Options

	Index: sys/boot/common/interp.c
	===================================================================
	--- sys/boot/common/interp.c
	+++ 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: sys/boot/common/loader.8
	===================================================================
	--- sys/boot/common/loader.8
	+++ 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,