diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/NOTES | 6 | ||||
| -rw-r--r-- | sys/conf/files | 9 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 9 | ||||
| -rw-r--r-- | sys/conf/files.pc98 | 9 | ||||
| -rw-r--r-- | sys/conf/options | 1 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 3 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 6 |
7 files changed, 16 insertions, 27 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 651dd11..1bc0871 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -918,6 +918,12 @@ device vcoda #coda minicache <-> venus comm. # options EXT2FS +# +# Add support for the ReiserFS filesystem (used in Linux). Currently, +# this is limited to read-only access. +# +options REISERFS + # Use real implementations of the aio_* system calls. There are numerous # stability and security issues in the current aio code that make it # unsuitable for inclusion on machines with untrusted local users. diff --git a/sys/conf/files b/sys/conf/files index 4c7b145..9ed6461 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1070,6 +1070,15 @@ gnu/fs/ext2fs/ext2_lookup.c optional ext2fs gnu/fs/ext2fs/ext2_subr.c optional ext2fs gnu/fs/ext2fs/ext2_vfsops.c optional ext2fs gnu/fs/ext2fs/ext2_vnops.c optional ext2fs +gnu/fs/reiserfs/reiserfs_hashes.c optional reiserfs \ + warning "kernel contains GPL contaminated ReiserFS filesystem" +gnu/fs/reiserfs/reiserfs_inode.c optional reiserfs +gnu/fs/reiserfs/reiserfs_item_ops.c optional reiserfs +gnu/fs/reiserfs/reiserfs_namei.c optional reiserfs +gnu/fs/reiserfs/reiserfs_prints.c optional reiserfs +gnu/fs/reiserfs/reiserfs_stree.c optional reiserfs +gnu/fs/reiserfs/reiserfs_vfsops.c optional reiserfs +gnu/fs/reiserfs/reiserfs_vnops.c optional reiserfs # # isdn4bsd device drivers # diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index d00d94c..4a103c9 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -224,15 +224,6 @@ geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_mbr.c standard geom/geom_mbr_enc.c standard -gnu/fs/reiserfs/reiserfs_hashes.c optional reiserfs \ - warning "kernel contains GPL contaminated ReiserFS filesystem" -gnu/fs/reiserfs/reiserfs_inode.c optional reiserfs -gnu/fs/reiserfs/reiserfs_item_ops.c optional reiserfs -gnu/fs/reiserfs/reiserfs_namei.c optional reiserfs -gnu/fs/reiserfs/reiserfs_prints.c optional reiserfs -gnu/fs/reiserfs/reiserfs_stree.c optional reiserfs -gnu/fs/reiserfs/reiserfs_vfsops.c optional reiserfs -gnu/fs/reiserfs/reiserfs_vnops.c optional reiserfs dev/acpica/acpi_if.m standard i386/acpica/OsdEnvironment.c optional acpi i386/acpica/acpi_machdep.c optional acpi diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index 332193e..3997f97 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -157,15 +157,6 @@ geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_pc98.c standard geom/geom_pc98_enc.c standard -gnu/reiserfs/reiserfs_hashes.c optional reiserfs \ - warning "kernel contains GPL contaminated ReiserFS filesystem" -gnu/reiserfs/reiserfs_inode.c optional reiserfs -gnu/reiserfs/reiserfs_item_ops.c optional reiserfs -gnu/reiserfs/reiserfs_namei.c optional reiserfs -gnu/reiserfs/reiserfs_prints.c optional reiserfs -gnu/reiserfs/reiserfs_stree.c optional reiserfs -gnu/reiserfs/reiserfs_vfsops.c optional reiserfs -gnu/reiserfs/reiserfs_vnops.c optional reiserfs i386/bios/apm.c optional apm #i386/i386/apic_vector.s optional apic i386/i386/atomic.c standard \ diff --git a/sys/conf/options b/sys/conf/options index 4fec7c6..bc7ecd3 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -177,6 +177,7 @@ NWFS opt_dontuse.h PORTALFS opt_dontuse.h PROCFS opt_dontuse.h PSEUDOFS opt_dontuse.h +REISERFS opt_dontuse.h SMBFS opt_dontuse.h UDF opt_dontuse.h UMAPFS opt_dontuse.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index cc251d9..28446f6 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -120,9 +120,6 @@ SPIGOT_UNSECURE opt_spigot.h # Enables NETGRAPH support for Cronyx adapters NETGRAPH_CRONYX opt_ng_cronyx.h -# ReiserFS -REISERFS opt_dontuse.h - # ------------------------------- # isdn4bsd: passive ISA cards # ------------------------------- diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index ccd85da..b04750b 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -264,12 +264,6 @@ options CLK_USE_I8254_CALIBRATION ##################################################################### # MISCELLANEOUS DEVICES AND OPTIONS -# -# Add support for the ReiserFS filesystem (used in Linux). Currently, -# this is limited to read-only access. -# -options REISERFS - device speaker #Play IBM BASIC-style noises out your speaker hint.speaker.0.at="isa" hint.speaker.0.port="0x61" |
