From 3e32dff52c088c13972d4cb60ab757dfca5e60c0 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 6 Jan 2015 16:15:57 +0000 Subject: [PATCH] Remove "New" label from NFSCL/NFSD now that they are the only NFS client/server. While here, remove duplicate NFSCL from sys/conf/NOTES. Approved by: rmacklem --- sys/amd64/conf/GENERIC | 4 ++-- sys/arm/conf/ARMADAXP | 2 +- sys/arm/conf/ATMEL | 4 ++-- sys/arm/conf/AVILA | 2 +- sys/arm/conf/BEAGLEBONE | 2 +- sys/arm/conf/BWCT | 4 ++-- sys/arm/conf/CAMBRIA | 2 +- sys/arm/conf/CNS11XXNAS | 4 ++-- sys/arm/conf/CRB | 4 ++-- sys/arm/conf/CUBIEBOARD | 2 +- sys/arm/conf/CUBIEBOARD2 | 2 +- sys/arm/conf/DB-78XXX | 2 +- sys/arm/conf/DB-88F5XXX | 2 +- sys/arm/conf/DB-88F6XXX | 2 +- sys/arm/conf/EB9200 | 4 ++-- sys/arm/conf/EFIKA_MX | 4 ++-- sys/arm/conf/EP80219 | 4 ++-- sys/arm/conf/ETHERNUT5 | 4 ++-- sys/arm/conf/EXYNOS5.common | 2 +- sys/arm/conf/GUMSTIX | 4 ++-- sys/arm/conf/HL200 | 4 ++-- sys/arm/conf/HL201 | 4 ++-- sys/arm/conf/IMX53 | 4 ++-- sys/arm/conf/IMX6 | 4 ++-- sys/arm/conf/IQ31244 | 4 ++-- sys/arm/conf/KB920X | 4 ++-- sys/arm/conf/LN2410SBC | 2 +- sys/arm/conf/NSLU | 4 ++-- sys/arm/conf/PANDABOARD | 2 +- sys/arm/conf/QILA9G20 | 4 ++-- sys/arm/conf/RK3188 | 2 +- sys/arm/conf/RPI-B | 2 +- sys/arm/conf/SAM9260EK | 4 ++-- sys/arm/conf/SAM9G20EK | 4 ++-- sys/arm/conf/SAM9X25EK | 4 ++-- sys/arm/conf/SHEEVAPLUG | 2 +- sys/arm/conf/SN9G45 | 4 ++-- sys/arm/conf/SOCKIT | 2 +- sys/arm/conf/SOCKIT-BERI | 2 +- sys/arm/conf/TS7800 | 2 +- sys/arm/conf/VERSATILEPB | 2 +- sys/arm/conf/VYBRID | 2 +- sys/arm/conf/ZEDBOARD | 2 +- sys/conf/NOTES | 5 ++--- sys/i386/conf/GENERIC | 4 ++-- sys/i386/conf/XBOX | 4 ++-- sys/i386/conf/XEN | 4 ++-- sys/mips/conf/BERI_DE4_BASE | 2 +- sys/pc98/conf/GENERIC | 4 ++-- sys/powerpc/conf/GENERIC | 4 ++-- sys/powerpc/conf/GENERIC64 | 4 ++-- sys/powerpc/conf/WII | 4 ++-- sys/sparc64/conf/GENERIC | 4 ++-- 53 files changed, 84 insertions(+), 85 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index e4cf06305ec..370ab10bba9 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -37,8 +37,8 @@ options UFS_DIRHASH # Improve performance on big directories options UFS_GJOURNAL # Enable gjournal-based UFS journaling options QUOTA # Enable disk quotas for UFS options MD_ROOT # MD is a potential root device -options NFSCL # New Network Filesystem Client -options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/ARMADAXP b/sys/arm/conf/ARMADAXP index e242c4a1ad5..32c610c061c 100644 --- a/sys/arm/conf/ARMADAXP +++ b/sys/arm/conf/ARMADAXP @@ -39,7 +39,7 @@ 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 QUOTA # Enable disk quotas for UFS -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/ATMEL b/sys/arm/conf/ATMEL index 615e06e4af5..2da5017585f 100644 --- a/sys/arm/conf/ATMEL +++ b/sys/arm/conf/ATMEL @@ -44,8 +44,8 @@ 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 MD_ROOT # MD is a potential root device -options NFSCL # New Network Filesystem Client -options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options TMPFS # Efficient memory filesystem diff --git a/sys/arm/conf/AVILA b/sys/arm/conf/AVILA index aed017d766e..cbf27a2b633 100644 --- a/sys/arm/conf/AVILA +++ b/sys/arm/conf/AVILA @@ -52,7 +52,7 @@ options GEOM_PART_MBR # MBR partition scheme options TMPFS # Efficient memory filesystem options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFS_ROOT # NFS usable as /, requires NFSCL options BOOTP options BOOTP_NFSROOT diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE index 6f7e53e9c77..cda34dffa48 100644 --- a/sys/arm/conf/BEAGLEBONE +++ b/sys/arm/conf/BEAGLEBONE @@ -39,7 +39,7 @@ 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 QUOTA # Enable disk quotas for UFS -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/BWCT b/sys/arm/conf/BWCT index 5ed552b702c..a9e0e784361 100644 --- a/sys/arm/conf/BWCT +++ b/sys/arm/conf/BWCT @@ -46,8 +46,8 @@ options SOFTUPDATES # Enable FFS soft updates support #options MD_ROOT_SIZE=4096 # 4MB ram disk #options ROOTDEVNAME=\"ufs:md0\" #options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" -options NFSCL # New Network Filesystem Client -#options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +#options NFSD # Network Filesystem Server #options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options BOOTP_NFSROOT diff --git a/sys/arm/conf/CAMBRIA b/sys/arm/conf/CAMBRIA index 55c72573b57..af29b230642 100644 --- a/sys/arm/conf/CAMBRIA +++ b/sys/arm/conf/CAMBRIA @@ -53,7 +53,7 @@ options GEOM_PART_MBR # MBR partition scheme options TMPFS # Efficient memory filesystem options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFS_ROOT # NFS usable as /, requires NFSCL options BOOTP options BOOTP_NFSROOT diff --git a/sys/arm/conf/CNS11XXNAS b/sys/arm/conf/CNS11XXNAS index 903fd0589fa..5ba221700c0 100644 --- a/sys/arm/conf/CNS11XXNAS +++ b/sys/arm/conf/CNS11XXNAS @@ -67,8 +67,8 @@ 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 NFSCL # New Network Filesystem Client -#options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +#options NFSD # Network Filesystem Server #options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options TMPFS # Efficient memory filesystem diff --git a/sys/arm/conf/CRB b/sys/arm/conf/CRB index d3d1a4bc412..641ba9f3f0f 100644 --- a/sys/arm/conf/CRB +++ b/sys/arm/conf/CRB @@ -40,8 +40,8 @@ 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 NFSCL # New Network Filesystem Client -options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL #options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/CUBIEBOARD b/sys/arm/conf/CUBIEBOARD index 40fe31305bd..2ca501584d4 100644 --- a/sys/arm/conf/CUBIEBOARD +++ b/sys/arm/conf/CUBIEBOARD @@ -38,7 +38,7 @@ 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 QUOTA # Enable disk quotas for UFS -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/CUBIEBOARD2 b/sys/arm/conf/CUBIEBOARD2 index 6b8d8300125..2ccdb59dcfb 100644 --- a/sys/arm/conf/CUBIEBOARD2 +++ b/sys/arm/conf/CUBIEBOARD2 @@ -38,7 +38,7 @@ 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 QUOTA # Enable disk quotas for UFS -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX index a09c5bd9757..2cfd5da0611 100644 --- a/sys/arm/conf/DB-78XXX +++ b/sys/arm/conf/DB-78XXX @@ -21,7 +21,7 @@ options GEOM_PART_MBR # MBR partition scheme options TMPFS # Efficient memory filesystem options FFS # Berkeley Fast Filesystem options NANDFS # NAND Filesystem -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options BOOTP diff --git a/sys/arm/conf/DB-88F5XXX b/sys/arm/conf/DB-88F5XXX index 2cdd6537583..c2b4b5889ea 100644 --- a/sys/arm/conf/DB-88F5XXX +++ b/sys/arm/conf/DB-88F5XXX @@ -20,7 +20,7 @@ options GEOM_PART_BSD # BSD partition scheme options GEOM_PART_MBR # MBR partition scheme options TMPFS # Efficient memory filesystem options FFS # Berkeley Fast Filesystem -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options BOOTP diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX index c0a81fca33e..c39e4a1e369 100644 --- a/sys/arm/conf/DB-88F6XXX +++ b/sys/arm/conf/DB-88F6XXX @@ -21,7 +21,7 @@ options GEOM_PART_MBR # MBR partition scheme options TMPFS # Efficient memory filesystem options FFS # Berkeley Fast Filesystem options NANDFS # NAND Filesystem -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options BOOTP diff --git a/sys/arm/conf/EB9200 b/sys/arm/conf/EB9200 index 49f06762635..a5ec5eb52f1 100644 --- a/sys/arm/conf/EB9200 +++ b/sys/arm/conf/EB9200 @@ -36,8 +36,8 @@ 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/da0s1a\" -options NFSCL # New Network Filesystem Client -options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options BOOTP_NFSROOT diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX index 459cd799306..6ea9d8a1286 100644 --- a/sys/arm/conf/EFIKA_MX +++ b/sys/arm/conf/EFIKA_MX @@ -36,8 +36,8 @@ options UFS_DIRHASH # Improve performance on big directories options UFS_GJOURNAL # Enable gjournal-based UFS journaling options QUOTA # Enable disk quotas for UFS #options MD_ROOT # MD is a potential root device -options NFSCL # New Network Filesystem Client -#options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +#options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/EP80219 b/sys/arm/conf/EP80219 index 6b7e6d58f12..35bcb17641f 100644 --- a/sys/arm/conf/EP80219 +++ b/sys/arm/conf/EP80219 @@ -39,8 +39,8 @@ 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 NFSCL # New Network Filesystem Client -options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options TMPFS # Efficient memory filesystem diff --git a/sys/arm/conf/ETHERNUT5 b/sys/arm/conf/ETHERNUT5 index 88f9949059e..376336a2332 100644 --- a/sys/arm/conf/ETHERNUT5 +++ b/sys/arm/conf/ETHERNUT5 @@ -39,8 +39,8 @@ options SOFTUPDATES # Enable FFS soft updates support options UFS_DIRHASH # Improve performance on big directories #options UFS_GJOURNAL # Enable gjournal-based UFS journaling #options MD_ROOT # MD is a potential root device -options NFSCL # New Network Filesystem Client -#options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +#options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options GEOM_PART_BSD # BSD partition scheme diff --git a/sys/arm/conf/EXYNOS5.common b/sys/arm/conf/EXYNOS5.common index 55dcb6eb33c..d8fe5d6b68f 100644 --- a/sys/arm/conf/EXYNOS5.common +++ b/sys/arm/conf/EXYNOS5.common @@ -35,7 +35,7 @@ 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 QUOTA # Enable disk quotas for UFS -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/GUMSTIX b/sys/arm/conf/GUMSTIX index d430d8f2a30..97d0ac7468d 100644 --- a/sys/arm/conf/GUMSTIX +++ b/sys/arm/conf/GUMSTIX @@ -44,8 +44,8 @@ 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 NFSCL # New Network Filesystem Client -#options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +#options NFSD # Network Filesystem Server options NFS_ROOT # NFS usable as /, requires NFSCL options GEOM_PART_BSD # BSD partition scheme options GEOM_PART_MBR # MBR partition scheme diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200 index 6c8140e1e5d..3c0f4e880ce 100644 --- a/sys/arm/conf/HL200 +++ b/sys/arm/conf/HL200 @@ -41,8 +41,8 @@ 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 NFSCL # New Network Filesystem Client -#options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +#options NFSD # Network Filesystem Server #options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options BOOTP_NFSROOT diff --git a/sys/arm/conf/HL201 b/sys/arm/conf/HL201 index 8a155440fbf..6a477af8098 100644 --- a/sys/arm/conf/HL201 +++ b/sys/arm/conf/HL201 @@ -40,8 +40,8 @@ options FFS # Berkeley Fast Filesystem #options MD_ROOT_SIZE=4096 # 4MB ram disk options NANDFS # NAND file system options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" -options NFSCL # New Network Filesystem Client -#options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +#options NFSD # Network Filesystem Server #options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL #options BOOTP_NFSROOT diff --git a/sys/arm/conf/IMX53 b/sys/arm/conf/IMX53 index 12cd4cfc0b0..d627c25b904 100644 --- a/sys/arm/conf/IMX53 +++ b/sys/arm/conf/IMX53 @@ -33,8 +33,8 @@ 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 QUOTA # Enable disk quotas for UFS -options NFSCL # New Network Filesystem Client -#options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +#options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6 index bdaab26fb7f..edee10fbc2d 100644 --- a/sys/arm/conf/IMX6 +++ b/sys/arm/conf/IMX6 @@ -33,8 +33,8 @@ 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 QUOTA # Enable disk quotas for UFS -options NFSCL # New Network Filesystem Client -#options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +#options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/IQ31244 b/sys/arm/conf/IQ31244 index a9c66f0fa12..2066fb85c69 100644 --- a/sys/arm/conf/IQ31244 +++ b/sys/arm/conf/IQ31244 @@ -40,8 +40,8 @@ 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 NFSCL # New Network Filesystem Client -options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options GEOM_PART_BSD # BSD partition scheme diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X index eb05d003770..1fc23be2b45 100644 --- a/sys/arm/conf/KB920X +++ b/sys/arm/conf/KB920X @@ -42,8 +42,8 @@ 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 NFSCL # New Network Filesystem Client -#options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +#options NFSD # Network Filesystem Server #options NFSLOCKD # Network Lock Manager #options NFS_ROOT # NFS usable as /, requires NFSCL #options BOOTP_NFSROOT diff --git a/sys/arm/conf/LN2410SBC b/sys/arm/conf/LN2410SBC index d4407eb509a..b2f64a0a771 100644 --- a/sys/arm/conf/LN2410SBC +++ b/sys/arm/conf/LN2410SBC @@ -44,7 +44,7 @@ options ROOTDEVNAME=\"ufs:da0s1\" #options BOOTP #options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info -#options NFSCL # New Network Filesystem Client +#options NFSCL # Network Filesystem Client #options NFS_ROOT # NFS usable as root device options GEOM_PART_BSD # BSD partition scheme diff --git a/sys/arm/conf/NSLU b/sys/arm/conf/NSLU index 4f40c46451d..e12c5a58384 100644 --- a/sys/arm/conf/NSLU +++ b/sys/arm/conf/NSLU @@ -59,8 +59,8 @@ 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 NFSCL # New Network Filesystem Client -options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options GEOM_PART_BSD # BSD partition scheme diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD index f6ecee3489b..551de735cb2 100644 --- a/sys/arm/conf/PANDABOARD +++ b/sys/arm/conf/PANDABOARD @@ -44,7 +44,7 @@ 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 QUOTA # Enable disk quotas for UFS -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/QILA9G20 b/sys/arm/conf/QILA9G20 index 39873f773ba..7559c31079f 100644 --- a/sys/arm/conf/QILA9G20 +++ b/sys/arm/conf/QILA9G20 @@ -41,8 +41,8 @@ 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 # 4MB ram disk -options NFSCL # New Network Filesystem Client -#options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +#options NFSD # Network Filesystem Server #options NFSLOCKD # Network Lock Manager #options NFS_ROOT # NFS usable as /, requires NFSCL #options BOOTP_NFSROOT diff --git a/sys/arm/conf/RK3188 b/sys/arm/conf/RK3188 index bbea7c146ba..13e2ed09a63 100644 --- a/sys/arm/conf/RK3188 +++ b/sys/arm/conf/RK3188 @@ -34,7 +34,7 @@ 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 QUOTA # Enable disk quotas for UFS -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B index c1013d1fe5f..db6d3b55297 100644 --- a/sys/arm/conf/RPI-B +++ b/sys/arm/conf/RPI-B @@ -34,7 +34,7 @@ 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 QUOTA # Enable disk quotas for UFS -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/SAM9260EK b/sys/arm/conf/SAM9260EK index dd0d52e2591..7e88ee1fb8b 100644 --- a/sys/arm/conf/SAM9260EK +++ b/sys/arm/conf/SAM9260EK @@ -41,8 +41,8 @@ options UFS_DIRHASH # Improve performance on big directories #options UFS_GJOURNAL # Enable gjournal-based UFS journaling #options MD_ROOT # MD is a potential root device options NANDFS # NAND file system -options NFSCL # New Network Filesystem Client -#options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +#options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options TMPFS # Efficient memory filesystem diff --git a/sys/arm/conf/SAM9G20EK b/sys/arm/conf/SAM9G20EK index b37a52cfbfc..7f3d15c1538 100644 --- a/sys/arm/conf/SAM9G20EK +++ b/sys/arm/conf/SAM9G20EK @@ -42,8 +42,8 @@ options FFS # Berkeley Fast Filesystem #options MD_ROOT # MD is a potential root device #options MD_ROOT_SIZE=4096 # 4MB ram disk options NANDFS # NAND file system -options NFSCL # New Network Filesystem Client -#options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +#options NFSD # Network Filesystem Server #options NFSLOCKD # Network Lock Manager #options NFS_ROOT # NFS usable as /, requires NFSCL #options BOOTP_NFSROOT diff --git a/sys/arm/conf/SAM9X25EK b/sys/arm/conf/SAM9X25EK index e3f5933299d..419e45631ab 100644 --- a/sys/arm/conf/SAM9X25EK +++ b/sys/arm/conf/SAM9X25EK @@ -43,8 +43,8 @@ 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 # 4MB ram disk -options NFSCL # New Network Filesystem Client -#options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +#options NFSD # Network Filesystem Server #options NFSLOCKD # Network Lock Manager #options NFS_ROOT # NFS usable as /, requires NFSCL #options BOOTP_NFSROOT diff --git a/sys/arm/conf/SHEEVAPLUG b/sys/arm/conf/SHEEVAPLUG index dc49b6a92eb..10a46daa653 100644 --- a/sys/arm/conf/SHEEVAPLUG +++ b/sys/arm/conf/SHEEVAPLUG @@ -21,7 +21,7 @@ options GEOM_PART_MBR # MBR partition scheme options TMPFS # Efficient memory filesystem options FFS # Berkeley Fast Filesystem options NANDFS # NAND Filesystem -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options BOOTP diff --git a/sys/arm/conf/SN9G45 b/sys/arm/conf/SN9G45 index 2f4fa99b123..dec6681986d 100644 --- a/sys/arm/conf/SN9G45 +++ b/sys/arm/conf/SN9G45 @@ -40,8 +40,8 @@ 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 # 4MB ram disk -options NFSCL # New Network Filesystem Client -#options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +#options NFSD # Network Filesystem Server #options NFSLOCKD # Network Lock Manager #options NFS_ROOT # NFS usable as /, requires NFSCL #options BOOTP_NFSROOT diff --git a/sys/arm/conf/SOCKIT b/sys/arm/conf/SOCKIT index 83f25f2316c..d0433124a38 100644 --- a/sys/arm/conf/SOCKIT +++ b/sys/arm/conf/SOCKIT @@ -37,7 +37,7 @@ 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 QUOTA # Enable disk quotas for UFS -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/SOCKIT-BERI b/sys/arm/conf/SOCKIT-BERI index 59e8c2cb738..1ea73c1bc9f 100644 --- a/sys/arm/conf/SOCKIT-BERI +++ b/sys/arm/conf/SOCKIT-BERI @@ -37,7 +37,7 @@ 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 QUOTA # Enable disk quotas for UFS -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/TS7800 b/sys/arm/conf/TS7800 index 49ec878eed9..484bc554bd6 100644 --- a/sys/arm/conf/TS7800 +++ b/sys/arm/conf/TS7800 @@ -18,7 +18,7 @@ options INET # InterNETworking options INET6 # IPv6 communications protocols options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options BOOTP diff --git a/sys/arm/conf/VERSATILEPB b/sys/arm/conf/VERSATILEPB index 2132389454f..c02d18c1981 100644 --- a/sys/arm/conf/VERSATILEPB +++ b/sys/arm/conf/VERSATILEPB @@ -43,7 +43,7 @@ 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 QUOTA # Enable disk quotas for UFS -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/VYBRID b/sys/arm/conf/VYBRID index 7ff206eedfb..6ac541e5516 100644 --- a/sys/arm/conf/VYBRID +++ b/sys/arm/conf/VYBRID @@ -38,7 +38,7 @@ 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 QUOTA # Enable disk quotas for UFS -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/arm/conf/ZEDBOARD b/sys/arm/conf/ZEDBOARD index d9c5915af7a..355999178ec 100644 --- a/sys/arm/conf/ZEDBOARD +++ b/sys/arm/conf/ZEDBOARD @@ -37,7 +37,7 @@ 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 QUOTA # Enable disk quotas for UFS -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client #options NFSSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 8199591aec8..c6ccc7e8d5e 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1019,7 +1019,7 @@ options DUMMYNET # One of these is mandatory: options FFS #Fast filesystem -options NFSCL #Network File System client +options NFSCL #Network File System client # The rest are optional: options AUTOFS #Automounter filesystem @@ -1028,8 +1028,7 @@ options FDESCFS #File descriptor filesystem options FUSE #FUSE support module options MSDOSFS #MS DOS File System (FAT, FAT32) options NFSLOCKD #Network Lock Manager -options NFSCL #New Network Filesystem Client -options NFSD #New Network Filesystem Server +options NFSD #Network Filesystem Server options KGSSAPI #Kernel GSSAPI implementation options NULLFS #NULL filesystem diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 9a0c3bc1230..29d56da1b2d 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -39,8 +39,8 @@ options UFS_DIRHASH # Improve performance on big directories options UFS_GJOURNAL # Enable gjournal-based UFS journaling options QUOTA # Enable disk quotas for UFS options MD_ROOT # MD is a potential root device -options NFSCL # New Network Filesystem Client -options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/i386/conf/XBOX b/sys/i386/conf/XBOX index 73f81e44cc6..5a8ded07704 100644 --- a/sys/i386/conf/XBOX +++ b/sys/i386/conf/XBOX @@ -27,8 +27,8 @@ 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 NFSCL # New Network Filesystem Client -#options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +#options NFSD # Network Filesystem Server #options NFSLOCKD # Network Lock Manager #options NFS_ROOT # NFS usable as /, requires NFSCL #options MSDOSFS # MSDOS Filesystem diff --git a/sys/i386/conf/XEN b/sys/i386/conf/XEN index 7cec0ffc4c8..dd83670e21b 100644 --- a/sys/i386/conf/XEN +++ b/sys/i386/conf/XEN @@ -25,8 +25,8 @@ 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 NFSCL # New Network Filesystem Client -options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/mips/conf/BERI_DE4_BASE b/sys/mips/conf/BERI_DE4_BASE index 84adf79b72f..f2c24c8949a 100644 --- a/sys/mips/conf/BERI_DE4_BASE +++ b/sys/mips/conf/BERI_DE4_BASE @@ -11,7 +11,7 @@ include "BERI_TEMPLATE" ident BERI_DE4_BASE -options NFSCL # New Network Filesystem Client +options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index 299606aa827..2312658b891 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -37,8 +37,8 @@ options UFS_DIRHASH # Improve performance on big directories options UFS_GJOURNAL # Enable gjournal-based UFS journaling options QUOTA # Enable disk quotas for UFS options MD_ROOT # MD is a potential root device -options NFSCL # New Network Filesystem Client -options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index d1ee43c9cf7..e3939be027a 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -44,8 +44,8 @@ options UFS_DIRHASH #Improve performance on big directories options UFS_GJOURNAL #Enable gjournal-based UFS journaling options QUOTA #Enable disk quotas for UFS options MD_ROOT #MD is a potential root device -options NFSCL #New Network Filesystem Client -options NFSD #New Network Filesystem Server +options NFSCL #Network Filesystem Client +options NFSD #Network Filesystem Server options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as root device options MSDOSFS #MSDOS Filesystem diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index 6bfa270b8b6..110749c5545 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -45,8 +45,8 @@ options UFS_DIRHASH #Improve performance on big directories options UFS_GJOURNAL #Enable gjournal-based UFS journaling options QUOTA #Enable disk quotas for UFS options MD_ROOT #MD is a potential root device -options NFSCL #New Network Filesystem Client -options NFSD #New Network Filesystem Server +options NFSCL #Network Filesystem Client +options NFSD #Network Filesystem Server options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as root device options MSDOSFS #MSDOS Filesystem diff --git a/sys/powerpc/conf/WII b/sys/powerpc/conf/WII index 8e21f2a0d50..ebfaffc7430 100644 --- a/sys/powerpc/conf/WII +++ b/sys/powerpc/conf/WII @@ -22,8 +22,8 @@ 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 MD_ROOT #MD is a potential root device -options NFSCL #New Network Filesystem Client -options NFSD #New Network Filesystem Server +options NFSCL #Network Filesystem Client +options NFSD #Network Filesystem Server options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as root device options MSDOSFS #MSDOS Filesystem diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index 0f9aa1bc1ee..5685185e5b2 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -38,8 +38,8 @@ options UFS_DIRHASH # Improve performance on big directories options UFS_GJOURNAL # Enable gjournal-based UFS journaling options QUOTA # Enable disk quotas for UFS options MD_ROOT # MD is a potential root device -options NFSCL # New Network Filesystem Client -options NFSD # New Network Filesystem Server +options NFSCL # Network Filesystem Client +options NFSD # Network Filesystem Server options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL #options MSDOSFS # MSDOS Filesystem