From 3f4806915ef86ad20f5602a0e46a27fc609e65ba Mon Sep 17 00:00:00 2001 From: attilio Date: Wed, 17 Oct 2012 11:16:17 +0000 Subject: Disconnect non-MPSAFE NWFS from the build in preparation for dropping GIANT from VFS. In addition, disconnect also netncp, which is a base requirement for NWFS. In the possibility of a future maintenance of the code and later readd to the FreeBSD base, maybe we should think about a better location for netncp. I'm not entirely sure the / top location is actually right, however I will let network people to comment on that more specifically. This is not targeted for MFC. --- etc/defaults/rc.conf | 2 +- etc/mtree/BSD.include.dist | 4 ---- etc/mtree/BSD.usr.dist | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) (limited to 'etc') diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 1dad35b..98c89e4 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -92,7 +92,7 @@ fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. fsck_y_flags="" # Additional flags for fsck -y background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. -netfs_types="nfs:NFS oldnfs:OLDNFS smbfs:SMB nwfs:NWFS" # Net filesystems. +netfs_types="nfs:NFS oldnfs:OLDNFS smbfs:SMB" # Net filesystems. extra_netfs_types="NO" # List of network extra filesystem types for delayed # mount at startup (or NO). diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 3d918a7..417b4f4 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -168,8 +168,6 @@ .. nullfs .. - nwfs - .. portalfs .. procfs @@ -287,8 +285,6 @@ sig .. .. - netncp - .. netsmb .. nfs diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 6c2ee065..bc3f4e7 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -281,8 +281,6 @@ bluetooth .. .. - nwclient - .. pc-sysinstall .. perfmon -- cgit v1.1