Skip to content

Commit

Permalink
7450 loader: Remove historical /boot/boot.conf inclusion.
Browse files Browse the repository at this point in the history
Reviewed by: Alexander Eremin <a.eremin@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Approved by: Robert Mustacchi <rm@joyent.com>
  • Loading branch information
tsoome authored and rmustacc committed Oct 5, 2016
1 parent 851874c commit b85b7e0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
3 changes: 1 addition & 2 deletions usr/src/boot/sys/boot/common/interp.c
Expand Up @@ -100,8 +100,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);

Expand Down
8 changes: 1 addition & 7 deletions usr/src/boot/sys/boot/common/loader.8
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b85b7e0

Please sign in to comment.