summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-11-24 00:23:16 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-11-24 00:23:16 +0000
commit92589102071c8f110bedfb2e74646484915f4f4f (patch)
tree122621594f038c03d88e54de914133829e80d99d /sys/conf
parentb7228c729edd1bfce25d67ea71b675820b71d35c (diff)
disable the layer filesystems by default; ok lots of people
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/GENERIC8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index f93e7ce4d68..110c9a2aa15 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.109 2004/07/31 21:27:31 brad Exp $
+# $OpenBSD: GENERIC,v 1.110 2004/11/24 00:23:15 deraadt Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -56,9 +56,9 @@ option KERNFS # /kern
option PORTAL # dynamically created filesystem objects
option PROCFS # /proc
# layer filesystems
-option NULLFS # loopback file system
-option UMAPFS # NULLFS + uid and gid remapping
-option UNION # union file system
+#option NULLFS # loopback file system
+#option UMAPFS # NULLFS + uid and gid remapping
+#option UNION # union file system
option INET # IP + ICMP + TCP + UDP
option ALTQ # ALTQ base