summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2003-02-28 21:29:09 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2003-02-28 21:29:09 +0000
commitf507e02165508482697191f85d6088e3e8f1fb25 (patch)
tree249c5716b01aec52376f3f2735912521bc7545c2 /sys/conf
parent5fc4aabcb7adb9f64513ecc91087a78166cda41d (diff)
do not entice people into playing with broken fs
ok deraadt@
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/GENERIC9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index d25b15e4800..578995eb689 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.92 2002/11/29 18:25:23 mickey Exp $
+# $OpenBSD: GENERIC,v 1.93 2003/02/28 21:29:08 tedu Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -50,11 +50,12 @@ option MSDOSFS # MS-DOS file system
option FDESC # /dev/fd
option FIFO # FIFOs; RECOMMENDED
option KERNFS # /kern
-option NULLFS # loopback file system
option PORTAL # dynamically created filesystem objects
option PROCFS # /proc
-option UMAPFS # NULLFS + uid and gid remapping
-option UNION # union file system
+# layer filesystems. not yet functional
+#option NULLFS # loopback file system
+#option UMAPFS # NULLFS + uid and gid remapping
+#option UNION # union file system
#option GATEWAY # packet forwarding
option INET # IP + ICMP + TCP + UDP