Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Use filesystems.config to reduce duplication
details: https://anonhg.NetBSD.org/src/rev/66c9309c4971
branches: trunk
changeset: 451100:66c9309c4971
user: sevan <sevan%NetBSD.org@localhost>
date: Mon May 06 02:24:37 2019 +0000
description:
Use filesystems.config to reduce duplication
diffstat:
sys/arch/amd64/conf/GENERIC | 39 ++---------------------------------
sys/arch/amd64/conf/XEN3_DOM0 | 36 ++------------------------------
sys/arch/amd64/conf/XEN3_DOMU | 36 ++------------------------------
sys/arch/i386/conf/GENERIC | 37 +++------------------------------
sys/arch/sgimips/conf/GENERIC32_IP12 | 28 ++-----------------------
sys/arch/sgimips/conf/GENERIC32_IP2x | 30 ++------------------------
sys/arch/sgimips/conf/GENERIC32_IP3x | 30 ++------------------------
sys/arch/sparc64/conf/GENERIC | 29 +++-----------------------
8 files changed, 26 insertions(+), 239 deletions(-)
diffs (truncated from 519 to 300 lines):
diff -r dcc12491f3bd -r 66c9309c4971 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Mon May 06 01:43:09 2019 +0000
+++ b/sys/arch/amd64/conf/GENERIC Mon May 06 02:24:37 2019 +0000
@@ -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 @@
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_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 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 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
diff -r dcc12491f3bd -r 66c9309c4971 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0 Mon May 06 01:43:09 2019 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0 Mon May 06 02:24:37 2019 +0000
@@ -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 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_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 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 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
diff -r dcc12491f3bd -r 66c9309c4971 sys/arch/amd64/conf/XEN3_DOMU
--- a/sys/arch/amd64/conf/XEN3_DOMU Mon May 06 01:43:09 2019 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOMU Mon May 06 02:24:37 2019 +0000
@@ -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 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_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 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 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 ?
diff -r dcc12491f3bd -r 66c9309c4971 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Mon May 06 01:43:09 2019 +0000
+++ b/sys/arch/i386/conf/GENERIC Mon May 06 02:24:37 2019 +0000
@@ -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 @@
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_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 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 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
diff -r dcc12491f3bd -r 66c9309c4971 sys/arch/sgimips/conf/GENERIC32_IP12
--- a/sys/arch/sgimips/conf/GENERIC32_IP12 Mon May 06 01:43:09 2019 +0000
+++ b/sys/arch/sgimips/conf/GENERIC32_IP12 Mon May 06 02:24:37 2019 +0000
@@ -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 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
Home |
Main Index |
Thread Index |
Old Index