From owner-cvs-src@FreeBSD.ORG Wed Sep 17 07:59:08 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7E3416A4C2 for ; Wed, 17 Sep 2003 07:59:08 -0700 (PDT) Received: from mail.speakeasy.net (mail7.speakeasy.net [216.254.0.207]) by mx1.FreeBSD.org (Postfix) with ESMTP id A82E643FB1 for ; Wed, 17 Sep 2003 07:59:03 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 4750 invoked from network); 17 Sep 2003 14:59:03 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 17 Sep 2003 14:59:03 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.9/8.12.9) with ESMTP id h8HEwx6Y082277; Wed, 17 Sep 2003 10:58:59 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20030917082559.GA60297@sunbay.com> Date: Wed, 17 Sep 2003 10:59:01 -0400 (EDT) From: John Baldwin To: Ruslan Ermilov X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: Doug Barton cc: src-committers@freebsd.org cc: cvs-src@freebsd.org cc: "Daniel C. Sobral" cc: Dag-Erling Sm?rgrav cc: Scott Long cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/boot/forth beastie.4th X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Sep 2003 14:59:08 -0000 On 17-Sep-2003 Ruslan Ermilov wrote: > On Tue, Sep 16, 2003 at 07:26:13PM -0700, Doug Barton wrote: >> On Tue, 16 Sep 2003, John Baldwin wrote: >> >> > >> > On 13-Sep-2003 Ruslan Ermilov wrote: >> >> > > This is likely to change. >> > >> > Erm, please do not change this. >> >> What's wrong with updating stuff in /boot/, as long as loader.conf.local >> can override any changes? >> > Once again, we're talking about loader.rc, not loader.conf*. ;) > > John, Daniel, > > I'd like to follow this route: > > - create /boot/forth, and move all *.4th files there, I would just leave them where they are. > - install stock loader.rc as /boot/defaults/loader.rc, > > - modify loader(8) to load /boot/loader.rc, and fall back to > /boot/defaults/loader.rc if the former does not exist. If someone wants to use a custom loader.rc they can overwrite the default. Just do this: Index: Makefile =================================================================== RCS file: /usr/cvs/src/sys/boot/i386/loader/Makefile,v retrieving revision 1.66 diff -u -r1.66 Makefile --- Makefile 26 Jun 2003 03:51:57 -0000 1.66 +++ Makefile 17 Sep 2003 14:57:17 -0000 @@ -100,13 +100,12 @@ ${PROG}.help: help.common help.i386 cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} +.if !defined(NOFORTH) .PATH: ${.CURDIR}/../../forth FILES= ${PROG}.help loader.4th support.4th loader.conf FILES+= screen.4th frames.4th beastie.4th -FILESDIR_loader.conf= /boot/defaults - -.if !exists(${DESTDIR}/boot/loader.rc) FILES+= ${.CURDIR}/loader.rc +FILESDIR_loader.conf= /boot/defaults .endif .include <${.CURDIR}/../Makefile.inc> Most things that use a custom loader.rc do so because they don't use Forth, so just wrapping this under NOFORTH should be enough for those folks. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/