d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure the proper loader.rc gets installed.

Browse Source 
There were two things wrong. First, the wrong path was listed in .PATH
statement. Second, BOOTSRC wasn't yet defined for the .PATH, so it
didn't properly add it. Third, even if these were right, . was in the
path before, so it wouldn't have worked. Replace this with a simple
loop so the proper loader.rc gets selected.

Noticed by: dhw@ (menus stopped working on boot)
Sponsored by: Netflix
This commit is contained in:
Warner Losh 2017-11-12 17:10:57 +00:00
parent 57c3dc51ca
commit 175748c982
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=325743
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/boot/forth/Makefile
View File

@ -1,5 +1,7 @@
# $FreeBSD$
.include <bsd.init.mk>
MAN+= beastie.4th.8 \
brand.4th.8 \
check-password.4th.8 \
@ -36,8 +38,13 @@ FILES+= support.4th
FILES+= version.4th
FILESDIR_loader.conf= /boot/defaults
# Everybody has these, but you can override
.PATH: ${BOOTSRC}/${MACHINE:C/amd64/i386/}/common ${BOOTSRC}/forth
FILES+= loader.rc menu.rc
# Allow machine specific loader.rc to be installed.
.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
FILES+= ${f}
.endif
.endfor
.include <bsd.prog.mk>