Change all the sample kernel configurations to use

NFSCL, NFSD instead of NFSCLIENT, NFSSERVER since
NFSCL and NFSD are now the defaults. The client change is
needed for diskless configurations, so that the root
mount works for fstype nfs.
Reported by seanbru at yahoo-inc.com for i386/XEN.

Approved by:	re (hrs)

28 files changed, 66 insertions, 66 deletions

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 4bfcfa3..4a38ebf 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -37,7 +37,7 @@ options 	MD_ROOT			# MD is a potential root device
 options 	NFSCL			# New Network Filesystem Client
 options 	NFSD			# New Network Filesystem Server
 options 	NFSLOCKD		# Network Lock Manager
-options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/AVILA b/sys/arm/conf/AVILA
index 0140eb0..7916b2c 100644
--- a/sys/arm/conf/AVILA
+++ b/sys/arm/conf/AVILA
@@ -50,8 +50,8 @@ options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
 options 	FFS			#Berkeley Fast Filesystem
 options 	SOFTUPDATES		#Enable FFS soft updates support
-options 	NFSCLIENT		#Network Filesystem Client
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFSCL			#New Network Filesystem Client
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 options 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_NFSV3
diff --git a/sys/arm/conf/BWCT b/sys/arm/conf/BWCT
index 0fb3b87..3a28e48 100644
--- a/sys/arm/conf/BWCT
+++ b/sys/arm/conf/BWCT
@@ -46,10 +46,10 @@ options 	SOFTUPDATES		#Enable FFS soft updates support
 #options 	MD_ROOT_SIZE=4096	# 3MB ram disk
 #options 	ROOTDEVNAME=\"ufs:md0\"
 #options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
-options 	NFSCLIENT		#Network Filesystem Client
-#options 	NFSSERVER		#Network Filesystem Server
+options 	NFSCL			#New Network Filesystem Client
+#options 	NFSD			#New Network Filesystem Server
 #options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 options 	BOOTP_NFSROOT
 options 	BOOTP
 
diff --git a/sys/arm/conf/CAMBRIA b/sys/arm/conf/CAMBRIA
index befe28a..19a8daa 100644
--- a/sys/arm/conf/CAMBRIA
+++ b/sys/arm/conf/CAMBRIA
@@ -51,8 +51,8 @@ options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
 options 	FFS			#Berkeley Fast Filesystem
 options 	SOFTUPDATES		#Enable FFS soft updates support
-options 	NFSCLIENT		#Network Filesystem Client
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFSCL			#New Network Filesystem Client
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 options 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_NFSV3
diff --git a/sys/arm/conf/CNS11XXNAS b/sys/arm/conf/CNS11XXNAS
index 76db42b..2832779 100644
--- a/sys/arm/conf/CNS11XXNAS
+++ b/sys/arm/conf/CNS11XXNAS
@@ -66,10 +66,10 @@ options 	FFS			#Berkeley Fast Filesystem
 options 	SOFTUPDATES		#Enable FFS soft updates support
 options 	UFS_ACL			#Support for access control lists
 options 	UFS_DIRHASH		#Improve performance on big directories
-options 	NFSCLIENT		#Network Filesystem Client
-#options 	NFSSERVER		#Network Filesystem Server
+options 	NFSCL			#New Network Filesystem Client
+#options 	NFSD			#New Network Filesystem Server
 #options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 options 	MSDOSFS			#MSDOS Filesystem
 #options 	CD9660			#ISO 9660 Filesystem
 #options 	PROCFS			#Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/CRB b/sys/arm/conf/CRB
index 45f19e0..bf12e0b 100644
--- a/sys/arm/conf/CRB
+++ b/sys/arm/conf/CRB
@@ -41,10 +41,10 @@ options 	FFS			#Berkeley Fast Filesystem
 options 	SOFTUPDATES		#Enable FFS soft updates support
 options 	UFS_ACL			#Support for access control lists
 options 	UFS_DIRHASH		#Improve performance on big directories
-options 	NFSCLIENT		#Network Filesystem Client
-options 	NFSSERVER		#Network Filesystem Server
+options 	NFSCL			#New Network Filesystem Client
+options 	NFSD			#New Network Filesystem Server
 options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 #options 	MSDOSFS			#MSDOS Filesystem
 options 	CD9660			#ISO 9660 Filesystem
 #options 	PROCFS			#Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX
index 7b58ada..d38ae55 100644
--- a/sys/arm/conf/DB-78XXX
+++ b/sys/arm/conf/DB-78XXX
@@ -17,9 +17,9 @@ options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
-options 	NFSCLIENT		#Network Filesystem Client
+options 	NFSCL			#New Network Filesystem Client
 options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 options 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_NFSV3
diff --git a/sys/arm/conf/DB-88F5XXX b/sys/arm/conf/DB-88F5XXX
index 655d4a7..d5df863 100644
--- a/sys/arm/conf/DB-88F5XXX
+++ b/sys/arm/conf/DB-88F5XXX
@@ -17,9 +17,9 @@ options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
-options 	NFSCLIENT		#Network Filesystem Client
+options 	NFSCL			#New Network Filesystem Client
 options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 options 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_NFSV3
diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX
index ff9f289..fec1c4e 100644
--- a/sys/arm/conf/DB-88F6XXX
+++ b/sys/arm/conf/DB-88F6XXX
@@ -17,9 +17,9 @@ options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
-options 	NFSCLIENT		#Network Filesystem Client
+options 	NFSCL			#New Network Filesystem Client
 options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 options 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_NFSV3
diff --git a/sys/arm/conf/DOCKSTAR b/sys/arm/conf/DOCKSTAR
index 780cb78..4e5b596 100644
--- a/sys/arm/conf/DOCKSTAR
+++ b/sys/arm/conf/DOCKSTAR
@@ -17,9 +17,9 @@ options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
-options 	NFSCLIENT		#Network Filesystem Client
+options 	NFSCL			#New Network Filesystem Client
 options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 options 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_NFSV3
diff --git a/sys/arm/conf/EP80219 b/sys/arm/conf/EP80219
index 23717df..38b0c2f 100644
--- a/sys/arm/conf/EP80219
+++ b/sys/arm/conf/EP80219
@@ -40,10 +40,10 @@ options 	FFS			#Berkeley Fast Filesystem
 options 	SOFTUPDATES		#Enable FFS soft updates support
 options 	UFS_ACL			#Support for access control lists
 options 	UFS_DIRHASH		#Improve performance on big directories
-options 	NFSCLIENT		#Network Filesystem Client
-options 	NFSSERVER		#Network Filesystem Server
+options 	NFSCL			#New Network Filesystem Client
+options 	NFSD			#New Network Filesystem Server
 options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 #options 	MSDOSFS			#MSDOS Filesystem
 options 	CD9660			#ISO 9660 Filesystem
 #options 	PROCFS			#Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/GUMSTIX b/sys/arm/conf/GUMSTIX
index e7900f5..8017a7a 100644
--- a/sys/arm/conf/GUMSTIX
+++ b/sys/arm/conf/GUMSTIX
@@ -45,9 +45,9 @@ options 	FFS			#Berkeley Fast Filesystem
 options 	SOFTUPDATES		#Enable FFS soft updates support
 options 	UFS_ACL			#Support for access control lists
 options 	UFS_DIRHASH		#Improve performance on big directories
-options 	NFSCLIENT		#Network Filesystem Client
-#options 	NFSSERVER		#Network Filesystem Server
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFSCL			#New Network Filesystem Client
+#options 	NFSD			#New Network Filesystem Server
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 #options 	MSDOSFS			#MSDOS Filesystem
 #options 	CD9660			#ISO 9660 Filesystem
 #options 	PROCFS			#Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200
index dd46a61..e42974d 100644
--- a/sys/arm/conf/HL200
+++ b/sys/arm/conf/HL200
@@ -39,10 +39,10 @@ options 	FFS			#Berkeley Fast Filesystem
 #options 	MD_ROOT			#MD is a potential root device
 #options 	MD_ROOT_SIZE=4096	# 3MB ram disk
 #options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
-options 	NFSCLIENT		#Network Filesystem Client
-#options 	NFSSERVER		#Network Filesystem Server
+options 	NFSCL			#New Network Filesystem Client
+#options 	NFSD			#New Network Filesystem Server
 #options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 options 	BOOTP_NFSROOT
 options 	BOOTP
 options 	BOOTP_NFSV3
diff --git a/sys/arm/conf/HL201 b/sys/arm/conf/HL201
index 6524cc6..af4266c 100644
--- a/sys/arm/conf/HL201
+++ b/sys/arm/conf/HL201
@@ -39,10 +39,10 @@ options 	FFS			#Berkeley Fast Filesystem
 #options 	MD_ROOT			#MD is a potential root device
 #options 	MD_ROOT_SIZE=4096	# 3MB ram disk
 #options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
-options 	NFSCLIENT		#Network Filesystem Client
-#options 	NFSSERVER		#Network Filesystem Server
+options 	NFSCL			#New Network Filesystem Client
+#options 	NFSD			#New Network Filesystem Server
 #options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 options 	BOOTP_NFSROOT
 options 	BOOTP
 options 	BOOTP_NFSV3
diff --git a/sys/arm/conf/IQ31244 b/sys/arm/conf/IQ31244
index 5679811..e35427c 100644
--- a/sys/arm/conf/IQ31244
+++ b/sys/arm/conf/IQ31244
@@ -41,10 +41,10 @@ options 	FFS			#Berkeley Fast Filesystem
 options 	SOFTUPDATES		#Enable FFS soft updates support
 options 	UFS_ACL			#Support for access control lists
 options 	UFS_DIRHASH		#Improve performance on big directories
-options 	NFSCLIENT		#Network Filesystem Client
-options 	NFSSERVER		#Network Filesystem Server
+options 	NFSCL			#New Network Filesystem Client
+options 	NFSD			#New Network Filesystem Server
 options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 #options 	MSDOSFS			#MSDOS Filesystem
 options 	CD9660			#ISO 9660 Filesystem
 #options 	PROCFS			#Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X
index f47e9ac..e9aa36e 100644
--- a/sys/arm/conf/KB920X
+++ b/sys/arm/conf/KB920X
@@ -40,10 +40,10 @@ options 	FFS			#Berkeley Fast Filesystem
 #options 	MD_ROOT			#MD is a potential root device
 #options 	MD_ROOT_SIZE=4096	# 4MB ram disk
 options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
-options 	NFSCLIENT		#Network Filesystem Client
-#options 	NFSSERVER		#Network Filesystem Server
+options 	NFSCL			#New Network Filesystem Client
+#options 	NFSD			#New Network Filesystem Server
 #options 	NFSLOCKD		#Network Lock Manager
-#options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+#options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 #options 	BOOTP_NFSROOT
 #options 	BOOTP
 
diff --git a/sys/arm/conf/LN2410SBC b/sys/arm/conf/LN2410SBC
index e4f3a54..4598aef 100644
--- a/sys/arm/conf/LN2410SBC
+++ b/sys/arm/conf/LN2410SBC
@@ -45,7 +45,7 @@ options		ROOTDEVNAME=\"ufs:da0s1\"
 
 #options 	BOOTP
 #options 	BOOTP_NFSROOT	# NFS mount root filesystem using BOOTP info
-#options 	NFSCLIENT		#Network File System client
+#options 	NFSCL			#New Network Filesystem Client
 #options 	NFS_ROOT		#NFS usable as root device
 
 options 	PSEUDOFS		#Pseudo-filesystem framework
diff --git a/sys/arm/conf/NSLU b/sys/arm/conf/NSLU
index d921e34..2e4f4b1 100644
--- a/sys/arm/conf/NSLU
+++ b/sys/arm/conf/NSLU
@@ -58,10 +58,10 @@ options 	FFS			#Berkeley Fast Filesystem
 options 	SOFTUPDATES		#Enable FFS soft updates support
 options 	UFS_ACL			#Support for access control lists
 options 	UFS_DIRHASH		#Improve performance on big directories
-options 	NFSCLIENT		#Network Filesystem Client
-options 	NFSSERVER		#Network Filesystem Server
+options 	NFSCL			#New Network Filesystem Client
+options 	NFSD			#New Network Filesystem Server
 options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 #options 	MSDOSFS			#MSDOS Filesystem
 options 	CD9660			#ISO 9660 Filesystem
 #options 	PROCFS			#Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/QILA9G20 b/sys/arm/conf/QILA9G20
index 55839ce..a99b7f4 100644
--- a/sys/arm/conf/QILA9G20
+++ b/sys/arm/conf/QILA9G20
@@ -39,10 +39,10 @@ options 	FFS			#Berkeley Fast Filesystem
 #options 	UFS_DIRHASH		#Improve performance on big directories
 #options 	MD_ROOT			#MD is a potential root device
 #options 	MD_ROOT_SIZE=4096	# 3MB ram disk
-options 	NFSCLIENT		#Network Filesystem Client
-#options 	NFSSERVER		#Network Filesystem Server
+options 	NFSCL			#New Network Filesystem Client
+#options 	NFSD			#New Network Filesystem Server
 #options 	NFSLOCKD		#Network Lock Manager
-#options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+#options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 #options 	BOOTP_NFSROOT
 #options 	BOOTP
 #options 	BOOTP_NFSV3
diff --git a/sys/arm/conf/SAM9G20EK b/sys/arm/conf/SAM9G20EK
index 6c2e94e..a9d0f96 100644
--- a/sys/arm/conf/SAM9G20EK
+++ b/sys/arm/conf/SAM9G20EK
@@ -38,10 +38,10 @@ options 	FFS			#Berkeley Fast Filesystem
 #options 	UFS_DIRHASH		#Improve performance on big directories
 #options 	MD_ROOT			#MD is a potential root device
 #options 	MD_ROOT_SIZE=4096	# 3MB ram disk
-options 	NFSCLIENT		#Network Filesystem Client
-#options 	NFSSERVER		#Network Filesystem Server
+options 	NFSCL			#New Network Filesystem Client
+#options 	NFSD			#New Network Filesystem Server
 #options 	NFSLOCKD		#Network Lock Manager
-#options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+#options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 #options 	BOOTP_NFSROOT
 #options 	BOOTP
 #options 	BOOTP_NFSV3
diff --git a/sys/arm/conf/SHEEVAPLUG b/sys/arm/conf/SHEEVAPLUG
index 75a5474..5392c95 100644
--- a/sys/arm/conf/SHEEVAPLUG
+++ b/sys/arm/conf/SHEEVAPLUG
@@ -17,9 +17,9 @@ options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
-options 	NFSCLIENT		#Network Filesystem Client
+options 	NFSCL			#New Network Filesystem Client
 options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 options 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_NFSV3
diff --git a/sys/arm/conf/SIMICS b/sys/arm/conf/SIMICS
index 229c60f..84ff983 100644
--- a/sys/arm/conf/SIMICS
+++ b/sys/arm/conf/SIMICS
@@ -39,10 +39,10 @@ options 	UFS_ACL			#Support for access control lists
 options 	UFS_DIRHASH		#Improve performance on big directories
 options 	MD_ROOT			#MD is a potential root device
 options 	ROOTDEVNAME=\"ufs:md0\"
-options 	NFSCLIENT		#Network Filesystem Client
-options 	NFSSERVER		#Network Filesystem Server
+options 	NFSCL			#New Network Filesystem Client
+options 	NFSD			#New Network Filesystem Server
 options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 #options 	MSDOSFS			#MSDOS Filesystem
 options 	CD9660			#ISO 9660 Filesystem
 #options 	PROCFS			#Process filesystem (requires PSEUDOFS)
diff --git a/sys/arm/conf/TS7800 b/sys/arm/conf/TS7800
index c72661a..5300cca 100644
--- a/sys/arm/conf/TS7800
+++ b/sys/arm/conf/TS7800
@@ -18,9 +18,9 @@ options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
 options 	SOFTUPDATES		# Enable FFS soft updates support
-options 	NFSCLIENT		#Network Filesystem Client
+options 	NFSCL			#New Network Filesystem Client
 options 	NFSLOCKD		#Network Lock Manager
-options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		#NFS usable as /, requires NFSCL
 options 	BOOTP
 options 	BOOTP_NFSROOT
 options 	BOOTP_NFSV3
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index c4548c6..87da6e7 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -39,7 +39,7 @@ options 	MD_ROOT			# MD is a potential root device
 options 	NFSCL			# New Network Filesystem Client
 options 	NFSD			# New Network Filesystem Server
 options 	NFSLOCKD		# Network Lock Manager
-options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
diff --git a/sys/i386/conf/XBOX b/sys/i386/conf/XBOX
index a3e8a6b..9ee270b 100644
--- a/sys/i386/conf/XBOX
+++ b/sys/i386/conf/XBOX
@@ -27,10 +27,10 @@ options 	SOFTUPDATES		# Enable FFS soft updates support
 #options 	UFS_ACL			# Support for access control lists
 #options 	UFS_DIRHASH		# Improve performance on big directories
 #options 	MD_ROOT			# MD is a potential root device
-options 	NFSCLIENT		# Network Filesystem Client
-#options 	NFSSERVER		# Network Filesystem Server
+options 	NFSCL			# New Network Filesystem Client
+#options 	NFSD			# New Network Filesystem Server
 #options 	NFSLOCKD		# Network Lock Manager
-#options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
+#options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 #options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 #options 	PROCFS			# Process filesystem (requires PSEUDOFS)
diff --git a/sys/i386/conf/XEN b/sys/i386/conf/XEN
index f1fb99b..ad453bf 100644
--- a/sys/i386/conf/XEN
+++ b/sys/i386/conf/XEN
@@ -21,10 +21,10 @@ options 	SOFTUPDATES		# Enable FFS soft updates support
 options 	UFS_ACL			# Support for access control lists
 options 	UFS_DIRHASH		# Improve performance on big directories
 options 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
-options 	NFSCLIENT		# Network Filesystem Client
-options 	NFSSERVER		# Network Filesystem Server
+options 	NFSCL			# New Network Filesystem Client
+options 	NFSD			# New Network Filesystem Server
 options 	NFSLOCKD		# Network Lock Manager
-options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index e2bed44..0995dfc 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -39,7 +39,7 @@ options 	MD_ROOT			# MD is a potential root device
 options 	NFSCL			# New Network Filesystem Client
 options 	NFSD			# New Network Filesystem Server
 options 	NFSLOCKD		# Network Lock Manager
-options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 11c5d35..fdafe69 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -40,7 +40,7 @@ options 	MD_ROOT			# MD is a potential root device
 options 	NFSCL			# New Network Filesystem Client
 options 	NFSD			# New Network Filesystem Server
 options 	NFSLOCKD		# Network Lock Manager
-options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 #options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)