diff options
| author |   thib <thib@openbsd.org> | 2011-01-19 21:37:03 +0000 |
|---|---|---|
| committer | thib <thib@openbsd.org> | 2011-01-19 21:37:03 +0000 |
| commit | 36a8777be180e1f62f2aa810978c80a0ebf61a99 (patch) | |
| tree | 3b9e0f2e99e1e466d8e45649db3d7455a54088c9 | |
| parent | add ldapd.conf; ok sthen@ (diff) | |
| download | wireguard-openbsd-36a8777be180e1f62f2aa810978c80a0ebf61a99.tar.xz wireguard-openbsd-36a8777be180e1f62f2aa810978c80a0ebf61a99.zip | |
group filesystems together
ok miod@
| -rw-r--r-- | sys/conf/GENERIC | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index 2868aa33aaa..262afab1c60 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.169 2011/01/07 17:50:42 bluhm Exp $ +# $OpenBSD: GENERIC,v 1.170 2011/01/19 21:37:03 thib Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -41,22 +41,20 @@ option QUOTA # UFS quotas option EXT2FS # Second Extended Filesystem option MFS # memory file system option NNPFS # NNPFS filesystem - -option SOCKET_SPLICE # Socket Splicing for TCP -option TCP_SACK # Selective Acknowledgements for TCP -option TCP_ECN # Explicit Congestion Notification for TCP -option TCP_SIGNATURE # TCP MD5 Signatures, for BGP routing sessions -#option TCP_FACK # Forward Acknowledgements for TCP - option NFSCLIENT # Network File System client option NFSSERVER # Network File System server - option CD9660 # ISO 9660 + Rock Ridge file system option UDF # UDF (DVD) file system option MSDOSFS # MS-DOS file system option FIFO # FIFOs; RECOMMENDED #option PORTAL # dynamically created filesystem objects +option SOCKET_SPLICE # Socket Splicing for TCP +option TCP_SACK # Selective Acknowledgements for TCP +option TCP_ECN # Explicit Congestion Notification for TCP +option TCP_SIGNATURE # TCP MD5 Signatures, for BGP routing sessions +#option TCP_FACK # Forward Acknowledgements for TCP + option INET # IP + ICMP + TCP + UDP option ALTQ # ALTQ base option INET6 # IPv6 (needs INET) |