diff options
| author | Sylvestre Gallon <syl@cvs.openbsd.org> | 2013-11-01 13:54:46 +0000 |
|---|---|---|
| committer | Sylvestre Gallon <syl@cvs.openbsd.org> | 2013-11-01 13:54:46 +0000 |
| commit | 1527bf0cd0c3d996327d66fe2fdb2f45bd90dcdf (patch) | |
| tree | 29703872b66b347d3a75a171b8d4cdc8be4639ec | |
| parent | aaded74dd972cf88253d26dd34aaa30196904964 (diff) | |
enable fuse.
ok deraadt@
| -rw-r--r-- | lib/Makefile | 4 | ||||
| -rw-r--r-- | sys/conf/GENERIC | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/Makefile b/lib/Makefile index 09e5ec187a0..29250b090d7 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.60 2013/06/17 19:18:37 robert Exp $ +# $OpenBSD: Makefile,v 1.61 2013/11/01 13:54:45 syl Exp $ # $NetBSD: Makefile,v 1.20.4.1 1996/06/14 17:22:38 cgd Exp $ SUBDIR= csu libarch libc libcompat libcurses \ libedit libevent libexpat \ - libform libkeynote libkvm libl libm libmenu \ + libform libfuse libkeynote libkvm libl libm libmenu \ libocurses libossaudio libpanel libpcap librthread librpcsvc \ libskey libsndio libsqlite3 libssl libusbhid libutil libwrap liby libz diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index cdd31bf7593..cc2d19fcec8 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.204 2013/10/21 12:07:47 reyk Exp $ +# $OpenBSD: GENERIC,v 1.205 2013/11/01 13:54:45 syl Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -45,6 +45,7 @@ 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 FUSE # FUSE option SOCKET_SPLICE # Socket Splicing for TCP and UDP option TCP_SACK # Selective Acknowledgements for TCP @@ -112,4 +113,6 @@ pseudo-device vlan # IEEE 802.1Q VLAN pseudo-device bio 1 # ioctl multiplexing device +pseudo-device fuse # fuse device + option BOOT_CONFIG # add support for boot -c |