Module Name: src
Committed By: tsutsui
Date: Fri Jul 18 17:06:13 UTC 2014
Modified Files:
src/sys/arch/x68k/conf: GENERIC
Log Message:
Enable NULLFS and MODULAR, and disable UMAPFS, accf_data and accf_http.
No particular comments on port-x68k@.
To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/sys/arch/x68k/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/conf/GENERIC
diff -u src/sys/arch/x68k/conf/GENERIC:1.173 src/sys/arch/x68k/conf/GENERIC:1.174
--- src/sys/arch/x68k/conf/GENERIC:1.173 Sat Jul 5 09:18:47 2014
+++ src/sys/arch/x68k/conf/GENERIC Fri Jul 18 17:06:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.173 2014/07/05 09:18:47 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.174 2014/07/18 17:06:13 tsutsui Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/x68k/conf/std.x68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.173 $"
+#ident "GENERIC-$Revision: 1.174 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -80,7 +80,7 @@ options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
## Loadable kernel module support
-#options MODULAR # new style module(7) framework
+options MODULAR # new style module(7) framework
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
@@ -175,11 +175,11 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
file-system FFS # Berkeley Fast Filesystem
file-system NFS # Sun NFS-compatible filesystem client
file-system KERNFS # kernel data-structure filesystem
-#file-system NULLFS # NULL layered filesystem
+file-system NULLFS # NULL layered filesystem
#file-system OVERLAY # overlay file system
file-system MFS # memory-based filesystem
#file-system FDESC # user file descriptor filesystem
-file-system UMAPFS # uid/gid remapping filesystem
+#file-system UMAPFS # uid/gid remapping filesystem
#file-system LFS # Log-structured filesystem (experimental)
file-system PROCFS # /proc
file-system CD9660 # ISO 9660 + Rock Ridge file system
@@ -428,8 +428,8 @@ bmd* at intio0 addr 0xecebf0 # Nereid
#
# accept filters
-pseudo-device accf_data # "dataready" accept filter
-pseudo-device accf_http # "httpready" accept filter
+#pseudo-device accf_data # "dataready" accept filter
+#pseudo-device accf_http # "httpready" accept filter
## A disk-like interface to files. Can be used to create floppy, CD,
## miniroot images, etc.
