- add dhcpcd support to x68k install ramdisk

- enable bpf(4) in INSTALL kernel for dhcpcd
- bump ramdisk size from 1400k to 1440k
No objection on port-x68k.
This commit is contained in:
tsutsui 2012-11-10 17:40:09 +00:00
parent d204c4c45c
commit 20f73e45ba
2 changed files with 7 additions and 5 deletions

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.40 2010/02/11 09:06:51 roy Exp $ # $NetBSD: Makefile,v 1.41 2012/11/10 17:40:09 tsutsui Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= inst.fs IMAGE= inst.fs
IMAGESIZE= 1400k IMAGESIZE= 1440k
# `floppy-root' cannot be used now, due to size issue. # `floppy-root' cannot be used now, due to size issue.
#IMAGE_RELEASEDIR= installation/floppy #IMAGE_RELEASEDIR= installation/floppy
@ -35,6 +35,7 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack
.include "${HACKSRC}/Makefile.inc" .include "${HACKSRC}/Makefile.inc"
${CRUNCHBIN}: libhack.o ${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.dhcpcd"
.include "${DISTRIBDIR}/common/Makefile.crunch" .include "${DISTRIBDIR}/common/Makefile.crunch"
.include "${DISTRIBDIR}/common/Makefile.makedev" .include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image" .include "${DISTRIBDIR}/common/Makefile.image"

View File

@ -1,4 +1,4 @@
# $NetBSD: INSTALL,v 1.95 2012/04/29 07:17:11 tsutsui Exp $ # $NetBSD: INSTALL,v 1.96 2012/11/10 17:40:09 tsutsui Exp $
# #
# INSTALL -- installation kernel. # INSTALL -- installation kernel.
@ -8,7 +8,7 @@ include "arch/x68k/conf/std.x68k"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary #options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "INSTALL-$Revision: 1.95 $" #ident "INSTALL-$Revision: 1.96 $"
makeoptions COPTS="-Os" # Optimise for space. Implies -O2 makeoptions COPTS="-Os" # Optimise for space. Implies -O2
@ -18,7 +18,7 @@ maxusers 4
options MEMORY_DISK_HOOKS options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # Force root on memory-disk options MEMORY_DISK_IS_ROOT # Force root on memory-disk
options MEMORY_DISK_SERVER=0 # No user space hooks options MEMORY_DISK_SERVER=0 # No user space hooks
options MEMORY_DISK_ROOT_SIZE=2800 options MEMORY_DISK_ROOT_SIZE=2880
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
## System kernel configuration. See options(4) for more detail. ## System kernel configuration. See options(4) for more detail.
@ -277,5 +277,6 @@ ne* at neptune? addr 0x300 # NE2000 or clone
pseudo-device md # boot floppy image pseudo-device md # boot floppy image
pseudo-device loop pseudo-device loop
pseudo-device bpfilter
pseudo-device sl pseudo-device sl
pseudo-device pty 2 # pseudo-terminals (Sysinst needs two) pseudo-device pty 2 # pseudo-terminals (Sysinst needs two)