diff options
author | wollman <wollman@FreeBSD.org> | 1994-09-09 22:03:51 +0000 |
---|---|---|
committer | wollman <wollman@FreeBSD.org> | 1994-09-09 22:03:51 +0000 |
commit | ded5569beec4c60cf02c4c8bffe3f111b275e24d (patch) | |
tree | 400aaa1b31332bf9dbc84f3307c9fcf16fee2a5d /sys/i386 | |
parent | 6c402d3fa0eba03240729d5f6445b1d073c6efce (diff) | |
download | FreeBSD-src-ded5569beec4c60cf02c4c8bffe3f111b275e24d.zip FreeBSD-src-ded5569beec4c60cf02c4c8bffe3f111b275e24d.tar.gz |
Don't include options MULTICAST or MROUTING in generic kernels. MULTICAST
has no effect now, and MROUTING should never be defined by default.
(Eventually the code should be dynamically loadable.)
Also, allow for Pentium CPUs in GENERICBT kernels.
Add an `install' rule to Makefile.i386, which looks like this:
mv /kernel /kernel.old
install -c -m 555 -o root -g root -fschg kernel /
I'd like comments on whether or not you think it's a good idea to have
the kernel be immutable by default; I'm happy either way.
CVS:
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/conf/GENERICAH | 4 | ||||
-rw-r--r-- | sys/i386/conf/GENERICBT | 5 | ||||
-rw-r--r-- | sys/i386/conf/Makefile.i386 | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/sys/i386/conf/GENERICAH b/sys/i386/conf/GENERICAH index c797de4..43638b5 100644 --- a/sys/i386/conf/GENERICAH +++ b/sys/i386/conf/GENERICAH @@ -1,7 +1,7 @@ # # GENERICAH -- Generic machine with WD/AHx/NCR family disks # -# $Id: GENERICAH,v 1.38 1994/08/31 06:17:19 davidg Exp $ +# $Id: GENERICAH,v 1.39 1994/09/01 02:19:28 se Exp $ # machine "i386" @@ -14,8 +14,6 @@ maxusers 10 options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking #options GATEWAY #Host is a Gateway (forwards packets) -options MULTICAST #IP Multicasting support -options MROUTING #IP Multicast Routing options FFS #Berkeley Fast File System options LFS #Log File System options MFS #Memory File System diff --git a/sys/i386/conf/GENERICBT b/sys/i386/conf/GENERICBT index ebe0eba..556c7d2 100644 --- a/sys/i386/conf/GENERICBT +++ b/sys/i386/conf/GENERICBT @@ -1,20 +1,19 @@ # # GENERICBT -- Generic machine with WD/BTx family disks # -# $Id: GENERICBT,v 1.36 1994/08/09 08:17:09 davidg Exp $ +# $Id: GENERICBT,v 1.37 1994/08/31 06:17:20 davidg Exp $ # machine "i386" cpu "I386_CPU" cpu "I486_CPU" +cpu "I586_CPU" ident GENERICBT maxusers 10 options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking #options GATEWAY #Host is a Gateway (forwards packets) -options MULTICAST #IP Multicasting support -options MROUTING #IP Multicast Routing options FFS #Berkeley Fast File System options LFS #Log File System options MFS #Memory File System diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index 2f53b9f..21ef4b4 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/conf/Makefile.i386 @@ -1,6 +1,6 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.34 1994/09/05 19:09:15 jkh Exp $ +# $Id: Makefile.i386,v 1.35 1994/09/05 19:10:01 jkh Exp $ # # Makefile for FreeBSD # @@ -172,6 +172,10 @@ links: tags: @echo "see $S/kern/Makefile for tags" +install: + mv /kernel /kernel.old + install -c -m 555 -o root -g wheel -fschg kernel / + ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h \ ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h ${CC} -c ${CFLAGS} ioconf.c |