Author: rmacklem
Date: Sun Aug  7 20:16:46 2011
New Revision: 224699
URL: http://svn.freebsd.org/changeset/base/224699

Log:
  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)

Modified:
  head/sys/amd64/conf/GENERIC
  head/sys/arm/conf/AVILA
  head/sys/arm/conf/BWCT
  head/sys/arm/conf/CAMBRIA
  head/sys/arm/conf/CNS11XXNAS
  head/sys/arm/conf/CRB
  head/sys/arm/conf/DB-78XXX
  head/sys/arm/conf/DB-88F5XXX
  head/sys/arm/conf/DB-88F6XXX
  head/sys/arm/conf/DOCKSTAR
  head/sys/arm/conf/EP80219
  head/sys/arm/conf/GUMSTIX
  head/sys/arm/conf/HL200
  head/sys/arm/conf/HL201
  head/sys/arm/conf/IQ31244
  head/sys/arm/conf/KB920X
  head/sys/arm/conf/LN2410SBC
  head/sys/arm/conf/NSLU
  head/sys/arm/conf/QILA9G20
  head/sys/arm/conf/SAM9G20EK
  head/sys/arm/conf/SHEEVAPLUG
  head/sys/arm/conf/SIMICS
  head/sys/arm/conf/TS7800
  head/sys/i386/conf/GENERIC
  head/sys/i386/conf/XBOX
  head/sys/i386/conf/XEN
  head/sys/pc98/conf/GENERIC
  head/sys/sparc64/conf/GENERIC

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/amd64/conf/GENERIC Sun Aug  7 20:16:46 2011        (r224699)
@@ -37,7 +37,7 @@ options       MD_ROOT                 # MD is a potential r
 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)

Modified: head/sys/arm/conf/AVILA
==============================================================================
--- head/sys/arm/conf/AVILA     Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/AVILA     Sun Aug  7 20:16:46 2011        (r224699)
@@ -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

Modified: head/sys/arm/conf/BWCT
==============================================================================
--- head/sys/arm/conf/BWCT      Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/BWCT      Sun Aug  7 20:16:46 2011        (r224699)
@@ -46,10 +46,10 @@ options     SOFTUPDATES             #Enable FFS soft u
 #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
 

Modified: head/sys/arm/conf/CAMBRIA
==============================================================================
--- head/sys/arm/conf/CAMBRIA   Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/CAMBRIA   Sun Aug  7 20:16:46 2011        (r224699)
@@ -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

Modified: head/sys/arm/conf/CNS11XXNAS
==============================================================================
--- head/sys/arm/conf/CNS11XXNAS        Sun Aug  7 18:37:05 2011        
(r224698)
+++ head/sys/arm/conf/CNS11XXNAS        Sun Aug  7 20:16:46 2011        
(r224699)
@@ -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)

Modified: head/sys/arm/conf/CRB
==============================================================================
--- head/sys/arm/conf/CRB       Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/CRB       Sun Aug  7 20:16:46 2011        (r224699)
@@ -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)

Modified: head/sys/arm/conf/DB-78XXX
==============================================================================
--- head/sys/arm/conf/DB-78XXX  Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/DB-78XXX  Sun Aug  7 20:16:46 2011        (r224699)
@@ -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

Modified: head/sys/arm/conf/DB-88F5XXX
==============================================================================
--- head/sys/arm/conf/DB-88F5XXX        Sun Aug  7 18:37:05 2011        
(r224698)
+++ head/sys/arm/conf/DB-88F5XXX        Sun Aug  7 20:16:46 2011        
(r224699)
@@ -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

Modified: head/sys/arm/conf/DB-88F6XXX
==============================================================================
--- head/sys/arm/conf/DB-88F6XXX        Sun Aug  7 18:37:05 2011        
(r224698)
+++ head/sys/arm/conf/DB-88F6XXX        Sun Aug  7 20:16:46 2011        
(r224699)
@@ -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

Modified: head/sys/arm/conf/DOCKSTAR
==============================================================================
--- head/sys/arm/conf/DOCKSTAR  Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/DOCKSTAR  Sun Aug  7 20:16:46 2011        (r224699)
@@ -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

Modified: head/sys/arm/conf/EP80219
==============================================================================
--- head/sys/arm/conf/EP80219   Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/EP80219   Sun Aug  7 20:16:46 2011        (r224699)
@@ -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)

Modified: head/sys/arm/conf/GUMSTIX
==============================================================================
--- head/sys/arm/conf/GUMSTIX   Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/GUMSTIX   Sun Aug  7 20:16:46 2011        (r224699)
@@ -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)

Modified: head/sys/arm/conf/HL200
==============================================================================
--- head/sys/arm/conf/HL200     Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/HL200     Sun Aug  7 20:16:46 2011        (r224699)
@@ -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

Modified: head/sys/arm/conf/HL201
==============================================================================
--- head/sys/arm/conf/HL201     Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/HL201     Sun Aug  7 20:16:46 2011        (r224699)
@@ -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

Modified: head/sys/arm/conf/IQ31244
==============================================================================
--- head/sys/arm/conf/IQ31244   Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/IQ31244   Sun Aug  7 20:16:46 2011        (r224699)
@@ -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)

Modified: head/sys/arm/conf/KB920X
==============================================================================
--- head/sys/arm/conf/KB920X    Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/KB920X    Sun Aug  7 20:16:46 2011        (r224699)
@@ -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
 

Modified: head/sys/arm/conf/LN2410SBC
==============================================================================
--- head/sys/arm/conf/LN2410SBC Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/LN2410SBC Sun Aug  7 20:16:46 2011        (r224699)
@@ -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

Modified: head/sys/arm/conf/NSLU
==============================================================================
--- head/sys/arm/conf/NSLU      Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/NSLU      Sun Aug  7 20:16:46 2011        (r224699)
@@ -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)

Modified: head/sys/arm/conf/QILA9G20
==============================================================================
--- head/sys/arm/conf/QILA9G20  Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/QILA9G20  Sun Aug  7 20:16:46 2011        (r224699)
@@ -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

Modified: head/sys/arm/conf/SAM9G20EK
==============================================================================
--- head/sys/arm/conf/SAM9G20EK Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/SAM9G20EK Sun Aug  7 20:16:46 2011        (r224699)
@@ -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

Modified: head/sys/arm/conf/SHEEVAPLUG
==============================================================================
--- head/sys/arm/conf/SHEEVAPLUG        Sun Aug  7 18:37:05 2011        
(r224698)
+++ head/sys/arm/conf/SHEEVAPLUG        Sun Aug  7 20:16:46 2011        
(r224699)
@@ -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

Modified: head/sys/arm/conf/SIMICS
==============================================================================
--- head/sys/arm/conf/SIMICS    Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/SIMICS    Sun Aug  7 20:16:46 2011        (r224699)
@@ -39,10 +39,10 @@ options     UFS_ACL                 #Support for access c
 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)

Modified: head/sys/arm/conf/TS7800
==============================================================================
--- head/sys/arm/conf/TS7800    Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/arm/conf/TS7800    Sun Aug  7 20:16:46 2011        (r224699)
@@ -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

Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC  Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/i386/conf/GENERIC  Sun Aug  7 20:16:46 2011        (r224699)
@@ -39,7 +39,7 @@ options       MD_ROOT                 # MD is a potential r
 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)

Modified: head/sys/i386/conf/XBOX
==============================================================================
--- head/sys/i386/conf/XBOX     Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/i386/conf/XBOX     Sun Aug  7 20:16:46 2011        (r224699)
@@ -27,10 +27,10 @@ options     SOFTUPDATES             # Enable FFS soft 
 #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)

Modified: head/sys/i386/conf/XEN
==============================================================================
--- head/sys/i386/conf/XEN      Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/i386/conf/XEN      Sun Aug  7 20:16:46 2011        (r224699)
@@ -21,10 +21,10 @@ options     SOFTUPDATES             # Enable FFS soft 
 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)

Modified: head/sys/pc98/conf/GENERIC
==============================================================================
--- head/sys/pc98/conf/GENERIC  Sun Aug  7 18:37:05 2011        (r224698)
+++ head/sys/pc98/conf/GENERIC  Sun Aug  7 20:16:46 2011        (r224699)
@@ -39,7 +39,7 @@ options       MD_ROOT                 # MD is a potential r
 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)

Modified: head/sys/sparc64/conf/GENERIC
==============================================================================
--- head/sys/sparc64/conf/GENERIC       Sun Aug  7 18:37:05 2011        
(r224698)
+++ head/sys/sparc64/conf/GENERIC       Sun Aug  7 20:16:46 2011        
(r224699)
@@ -40,7 +40,7 @@ options       MD_ROOT                 # MD is a potential r
 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)
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to