Date: Wed, 17 Sep 2003 10:59:01 -0400 (EDT) From: John Baldwin <jhb@FreeBSD.org> To: Ruslan Ermilov <ru@freebsd.org> Cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/boot/forth beastie.4th Message-ID: <XFMail.20030917105901.jhb@FreeBSD.org> In-Reply-To: <20030917082559.GA60297@sunbay.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <jhb@FreeBSD.org> <>< http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve!" - http://www.FreeBSD.org/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?XFMail.20030917105901.jhb>