Use filesystems.config to reduce duplication

This commit is contained in:
sevan 2019-05-06 02:24:37 +00:00
parent 1850e1c560
commit f8755991ed
8 changed files with 26 additions and 239 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.526 2019/04/26 21:40:28 sevan Exp $
# $NetBSD: GENERIC,v 1.527 2019/05/06 02:24:37 sevan Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.526 $"
#ident "GENERIC-$Revision: 1.527 $"
maxusers 64 # estimated number of users
@ -164,30 +164,7 @@ options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
#options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges
# File systems
file-system FFS # UFS
file-system MFS # memory file system
file-system NFS # Network File System client
file-system TMPFS # Efficient memory file-system
file-system EXT2FS # second extended file system (linux)
file-system LFS # log-structured file system
file-system NTFS # Windows/NT file system (experimental)
file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system MSDOSFS # MS-DOS file system
file-system FDESC # /dev/fd
file-system KERNFS # /kern
file-system NULLFS # loopback file system
file-system OVERLAY # overlay file system
file-system PROCFS # /proc
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
file-system SMBFS # experimental - CIFS; also needs nsmb (below)
file-system UMAPFS # NULLFS + uid and gid remapping
file-system UNION # union file system
file-system CODA # Coda File System; also needs vcoda (below)
file-system PTYFS # /dev/ptm support
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
#file-system HFS # experimental - Apple HFS+ (read-only)
#file-system NILFS # experimental - NTT's NiLFS(2)
#file-system AUTOFS # experimental - Automounter Filesystem
include "conf/filesystems.config"
# File system options
# ffs
@ -1121,7 +1098,6 @@ options RAID_AUTOCONFIG # auto-configuration of RAID components
#options RF_INCLUDE_PARITY_DECLUSTERING=1
#options RF_INCLUDE_PARITY_DECLUSTERING_DS=1
pseudo-device fss # file system snapshot device
pseudo-device putter # for puffs and pud
pseudo-device md # memory disk device (ramdisk)
options MEMORY_DISK_HOOKS # enable root ramdisk
@ -1174,15 +1150,6 @@ pseudo-device bcsp # BlueCore Serial Protocol
pseudo-device btuart # Bluetooth HCI UART (H4)
#pseudo-device nvmm # NetBSD Virtual Machine Monitor
# a pseudo device needed for Coda # also needs CODA (above)
pseudo-device vcoda # coda minicache <-> venus comm.
# a pseudo device needed for SMBFS
pseudo-device nsmb # experimental - SMB requester
# a pseudo device needed for AUTOFS
#pseudo-device autofs # experimental - AUTOFS
# wscons pseudo-devices
pseudo-device wsmux # mouse & keyboard multiplexor
pseudo-device wsfont

View File

@ -1,4 +1,4 @@
# $NetBSD: XEN3_DOM0,v 1.166 2019/02/11 14:59:32 cherry Exp $
# $NetBSD: XEN3_DOM0,v 1.167 2019/05/06 02:24:37 sevan Exp $
include "arch/amd64/conf/std.xen"
@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
#ident "XEN3_DOM0-$Revision: 1.166 $"
#ident "XEN3_DOM0-$Revision: 1.167 $"
maxusers 32 # estimated number of users
@ -85,27 +85,7 @@ options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
#options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges
# File systems
file-system FFS # UFS
file-system EXT2FS # second extended file system (linux)
file-system LFS # log-structured file system
file-system MFS # memory file system
file-system NFS # Network File System client
file-system NTFS # Windows/NT file system (experimental)
file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system MSDOSFS # MS-DOS file system
file-system FDESC # /dev/fd
file-system KERNFS # /kern
file-system NULLFS # loopback file system
file-system OVERLAY # overlay file system
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
file-system PROCFS # /proc
file-system UMAPFS # NULLFS + uid and gid remapping
file-system UNION # union file system
file-system CODA # Coda File System; also needs vcoda (below)
file-system SMBFS # experimental - CIFS; also needs nsmb (below)
file-system PTYFS # /dev/pts/N support
file-system TMPFS # Efficient memory file-system
#file-system AUTOFS # Automounter Filesystem
include "conf/filesystems.config"
# File system options
options QUOTA # legacy UFS quotas
@ -858,7 +838,6 @@ pseudo-device fss # file system snapshot device
pseudo-device md # memory disk device (ramdisk)
pseudo-device vnd # disk-like interface to files
pseudo-device putter # for puffs and pud
pseudo-device dm # device-mapper driver for LVM
# network pseudo-devices
@ -884,15 +863,6 @@ pseudo-device pty # pseudo-terminals
pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
# a pseudo device needed for Coda # also needs CODA (above)
pseudo-device vcoda # coda minicache <-> venus comm.
# a pseudo device needed for SMBFS
pseudo-device nsmb # experimental - SMB requester
# a pseudo device needed for AUTOFS
#pseudo-device autofs # experimental - AUTOFS
# iSCSI initiator
#pseudo-device iscsi

View File

@ -1,4 +1,4 @@
# $NetBSD: XEN3_DOMU,v 1.88 2019/02/11 14:59:32 cherry Exp $
# $NetBSD: XEN3_DOMU,v 1.89 2019/05/06 02:24:37 sevan Exp $
include "arch/amd64/conf/std.xen"
@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
#ident "XEN3_DOMU-$Revision: 1.88 $"
#ident "XEN3_DOMU-$Revision: 1.89 $"
maxusers 32 # estimated number of users
@ -77,27 +77,7 @@ options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
#options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges
# File systems
file-system FFS # UFS
file-system EXT2FS # second extended file system (linux)
file-system LFS # log-structured file system
file-system MFS # memory file system
file-system NFS # Network File System client
file-system NTFS # Windows/NT file system (experimental)
file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system MSDOSFS # MS-DOS file system
file-system FDESC # /dev/fd
file-system KERNFS # /kern
file-system NULLFS # loopback file system
file-system OVERLAY # overlay file system
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
file-system PROCFS # /proc
file-system UMAPFS # NULLFS + uid and gid remapping
file-system UNION # union file system
file-system CODA # Coda File System; also needs vcoda (below)
file-system SMBFS # experimental - CIFS; also needs nsmb (below)
file-system PTYFS # /dev/pts/N support
file-system TMPFS # Efficient memory file-system
#file-system AUTOFS # Automounter Filesystem
include "conf/filesystems.config"
# File system options
options QUOTA # legacy UFS quotas
@ -195,7 +175,6 @@ options RAID_AUTOCONFIG # auto-configuration of RAID components
#options RF_INCLUDE_PARITY_DECLUSTERING=1
#options RF_INCLUDE_PARITY_DECLUSTERING_DS=1
pseudo-device fss # file system snapshot device
pseudo-device putter # for puffs and pud
pseudo-device md # memory disk device (ramdisk)
pseudo-device vnd # disk-like interface to files
@ -229,15 +208,6 @@ pseudo-device pty # pseudo-terminals
pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
# a pseudo device needed for Coda # also needs CODA (above)
pseudo-device vcoda # coda minicache <-> venus comm.
# a pseudo device needed for SMBFS
pseudo-device nsmb # experimental - SMB requester
# a pseudo device needed for AUTOFS
#pseudo-device autofs # experimental - AUTOFS
# iSCSI initiator and dependencies
#scsibus* at scsi?
#sd* at scsibus? target ? lun ?

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.1205 2019/04/26 21:40:30 sevan Exp $
# $NetBSD: GENERIC,v 1.1206 2019/05/06 02:24:37 sevan Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.1205 $"
#ident "GENERIC-$Revision: 1.1206 $"
maxusers 64 # estimated number of users
@ -146,30 +146,8 @@ options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges
#options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges
file-system FFS # UFS
file-system NFS # Network File System client
file-system EXT2FS # second extended file system (linux)
file-system LFS # log-structured file system
file-system MFS # memory file system
file-system NTFS # Windows/NT file system (experimental)
file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system MSDOSFS # MS-DOS file system
file-system FDESC # /dev/fd
file-system KERNFS # /kern
file-system NULLFS # loopback file system
file-system OVERLAY # overlay file system
file-system PROCFS # /proc
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
file-system UMAPFS # NULLFS + uid and gid remapping
file-system UNION # union file system
file-system CODA # Coda File System; also needs vcoda (below)
file-system SMBFS # experimental - CIFS; also needs nsmb (below)
file-system PTYFS # /dev/ptm support
file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
#file-system HFS # experimental - Apple HFS+ (read-only)
#file-system NILFS # experimental - NTT's NiLFS(2)
#file-system V7FS # 7th Edition(V7) File System
# File systems
include "conf/filesystems.config"
# File system options
options QUOTA # legacy UFS quotas
@ -1460,7 +1438,6 @@ options RAID_AUTOCONFIG # auto-configuration of RAID components
#options RF_INCLUDE_PARITY_DECLUSTERING=1
#options RF_INCLUDE_PARITY_DECLUSTERING_DS=1
pseudo-device fss # file system snapshot device
pseudo-device putter # for puffs and pud
pseudo-device md # memory disk device (ramdisk)
options MEMORY_DISK_HOOKS # enable root ramdisk
@ -1514,12 +1491,6 @@ pseudo-device bcsp # BlueCore Serial Protocol
pseudo-device btuart # Bluetooth HCI UART (H4)
#pseudo-device gpiosim 1 # GPIO simulator
# a pseudo device needed for Coda # also needs CODA (above)
pseudo-device vcoda # coda minicache <-> venus comm.
# a pseudo device needed for SMBFS
pseudo-device nsmb # experimental - SMB requester
# wscons pseudo-devices
pseudo-device wsmux # mouse & keyboard multiplexor
pseudo-device wsfont

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC32_IP12,v 1.35 2019/04/26 21:40:32 sevan Exp $
# $NetBSD: GENERIC32_IP12,v 1.36 2019/05/06 02:24:37 sevan Exp $
#
# GENERIC32_IP12 machine description file
#
@ -32,7 +32,7 @@ makeoptions TEXTADDR=0x80002000 # entry point
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC32-IP2x-$Revision: 1.35 $"
#ident "GENERIC32-IP2x-$Revision: 1.36 $"
maxusers 32
@ -81,26 +81,7 @@ include "conf/compat_netbsd15.config"
#options COMPAT_ULTRIX # binary compatibility with Ultrix
# File systems
file-system FFS # UFS
#file-system EXT2FS # second extended file system (linux)
#file-system LFS # log-structured file system
file-system MFS # memory file system
file-system NFS # Network File System client
#file-system NTFS # Windows/NT file system (experimental)
file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system MSDOSFS # MS-DOS file system
#file-system FDESC # /dev/fd
file-system KERNFS # /kern
#file-system NULLFS # loopback file system
#file-system OVERLAY # overlay file system
file-system PROCFS # /proc
#file-system UMAPFS # NULLFS + uid and gid remapping
#file-system UNION # union file system
#file-system CODA # Coda File System; also needs vcoda (below)
file-system PTYFS # /dev/pts/N support
file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
file-system EFS # Silicon Graphics Extent File System
include "conf/filesystems.config"
# File system options
options QUOTA # legacy UFS quotas
@ -264,7 +245,4 @@ pseudo-device ksyms # /dev/ksyms
pseudo-device wsmux # mouse & keyboard multiplexor
pseudo-device wsfont
# a pseudo device needed for Coda # also needs CODA (above)
#pseudo-device vcoda # coda minicache <-> venus comm.
include "dev/veriexec.config"

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC32_IP2x,v 1.116 2019/04/26 21:40:32 sevan Exp $
# $NetBSD: GENERIC32_IP2x,v 1.117 2019/05/06 02:24:37 sevan Exp $
#
# GENERIC32_IP2x machine description file
#
@ -29,7 +29,7 @@ makeoptions TEXTADDR=0x88069000 # entry point
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC32-IP2x-$Revision: 1.116 $"
#ident "GENERIC32-IP2x-$Revision: 1.117 $"
maxusers 32
@ -81,27 +81,7 @@ options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_ULTRIX # binary compatibility with Ultrix
# File systems
file-system FFS # UFS
file-system EXT2FS # second extended file system (linux)
file-system LFS # log-structured file system
file-system MFS # memory file system
file-system NFS # Network File System client
file-system NTFS # Windows/NT file system (experimental)
file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system MSDOSFS # MS-DOS file system
file-system FDESC # /dev/fd
file-system KERNFS # /kern
file-system NULLFS # loopback file system
file-system OVERLAY # overlay file system
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
file-system PROCFS # /proc
file-system UMAPFS # NULLFS + uid and gid remapping
file-system UNION # union file system
file-system CODA # Coda File System; also needs vcoda (below)
file-system PTYFS # /dev/pts/N support
file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
file-system EFS # Silicon Graphics Extent File System
include "conf/filesystems.config"
# File system options
options QUOTA # legacy UFS quotas
@ -311,9 +291,5 @@ pseudo-device drvctl # user control of drive subsystem
pseudo-device ksyms # /dev/ksyms
pseudo-device wsmux # mouse & keyboard multiplexor
pseudo-device wsfont
pseudo-device putter # for puffs and pud
# a pseudo device needed for Coda # also needs CODA (above)
pseudo-device vcoda # coda minicache <-> venus comm.
include "dev/veriexec.config"

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC32_IP3x,v 1.125 2019/04/26 21:40:32 sevan Exp $
# $NetBSD: GENERIC32_IP3x,v 1.126 2019/05/06 02:24:37 sevan Exp $
#
# GENERIC32_IP3x machine description file
#
@ -28,7 +28,7 @@ makeoptions TEXTADDR="0x80069000" # entry point
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC32_IP3x-$Revision: 1.125 $"
#ident "GENERIC32_IP3x-$Revision: 1.126 $"
maxusers 32
@ -74,27 +74,7 @@ options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_ULTRIX # binary compatibility with Ultrix
# File systems
file-system FFS # UFS
file-system EXT2FS # second extended file system (linux)
file-system LFS # log-structured file system
file-system MFS # memory file system
file-system NFS # Network File System client
file-system NTFS # Windows/NT file system (experimental)
file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system MSDOSFS # MS-DOS file system
file-system FDESC # /dev/fd
file-system KERNFS # /kern
file-system NULLFS # loopback file system
file-system OVERLAY # overlay file system
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
file-system PROCFS # /proc
file-system UMAPFS # NULLFS + uid and gid remapping
file-system UNION # union file system
file-system CODA # Coda File System; also needs vcoda (below)
file-system PTYFS # /dev/pts/N support
file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
file-system EFS # Silicon Graphics Extent File System
include "conf/filesystems.config"
# File system options
options QUOTA # legacy UFS quotas
@ -348,7 +328,6 @@ pseudo-device pty # pseudo-terminals
pseudo-device sequencer # MIDI sequencer
pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
pseudo-device putter # for puffs and pud
# wscons pseudo-devices
pseudo-device wsmux # mouse & keyboard multiplexor
@ -357,7 +336,4 @@ pseudo-device wsfont
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
# a pseudo device needed for Coda # also needs CODA (above)
pseudo-device vcoda # coda minicache <-> venus comm.
include "dev/veriexec.config"

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.215 2019/04/26 21:40:32 sevan Exp $
# $NetBSD: GENERIC,v 1.216 2019/05/06 02:24:37 sevan Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.215 $"
#ident "GENERIC-$Revision: 1.216 $"
maxusers 64
@ -138,25 +138,8 @@ options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility -- 64-bit only
options EXEC_AOUT # execve(2) support for a.out binaries
options EXEC_ELF32 # Exec module for SunOS 5.x binaries.
## File systems. You probably need at least one of FFS or NFS.
file-system FFS # Berkeley Fast Filesystem
file-system NFS # Sun NFS-compatible filesystem client
file-system KERNFS # kernel data-structure filesystem
file-system NULLFS # NULL layered filesystem
file-system OVERLAY # overlay file system
file-system MFS # memory-based filesystem
file-system FDESC # user file descriptor filesystem
file-system UMAPFS # uid/gid remapping filesystem
file-system LFS # Log-based filesystem (still experimental)
file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
file-system PROCFS # /proc
file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system UNION # union file system
file-system MSDOSFS # MS-DOS FAT filesystem(s).
file-system PTYFS # /dev/pts/N support
file-system SMBFS # experimental - CIFS; also needs nsmb (below)
file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
## File systems.
include "conf/filesystems.config"
## File system options.
options NFSSERVER # Sun NFS-compatible filesystem server
@ -975,10 +958,6 @@ pseudo-device fss # file system snapshot device
#pseudo-device bcsp # BlueCore Serial Protocol
#pseudo-device btuart # Bluetooth HCI UART (H4)
pseudo-device lockstat # lock profiling
pseudo-device putter # for puffs and pud
# a pseudo device needed for SMBFS
pseudo-device nsmb # experimental - SMB requester
# drvctl - needed to show device dictionary via drvctl(8)
pseudo-device drvctl