From owner-svn-src-head@freebsd.org  Sun Nov 12 17:10:58 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 957DCC31109;
 Sun, 12 Nov 2017 17:10:58 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 62B836DF77;
 Sun, 12 Nov 2017 17:10:58 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vACHAv0r025651;
 Sun, 12 Nov 2017 17:10:57 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vACHAvYu025650;
 Sun, 12 Nov 2017 17:10:57 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201711121710.vACHAvYu025650@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 12 Nov 2017 17:10:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325743 - head/sys/boot/forth
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/sys/boot/forth
X-SVN-Commit-Revision: 325743
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Nov 2017 17:10:58 -0000

Author: imp
Date: Sun Nov 12 17:10:57 2017
New Revision: 325743
URL: https://svnweb.freebsd.org/changeset/base/325743

Log:
  Make sure the proper loader.rc gets installed.
  
  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

Modified:
  head/sys/boot/forth/Makefile

Modified: head/sys/boot/forth/Makefile
==============================================================================
--- head/sys/boot/forth/Makefile	Sun Nov 12 09:42:42 2017	(r325742)
+++ head/sys/boot/forth/Makefile	Sun Nov 12 17:10:57 2017	(r325743)
@@ -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>