summaryrefslogtreecommitdiffstats
path: root/sys/i386/conf
diff options
context:
space:
mode:
authorrmacklem <rmacklem@FreeBSD.org>2011-08-07 20:16:46 +0000
committerrmacklem <rmacklem@FreeBSD.org>2011-08-07 20:16:46 +0000
commit3b8ed22952425642bc1493e6c65ae4d6e09a8438 (patch)
tree75d34643080bca7f720fc094e5ecea64d5cebfbb /sys/i386/conf
parent18728bba7168d9fe3ad61b25beaa7a8c9bc10664 (diff)
downloadFreeBSD-src-3b8ed22952425642bc1493e6c65ae4d6e09a8438.zip
FreeBSD-src-3b8ed22952425642bc1493e6c65ae4d6e09a8438.tar.gz
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)
Diffstat (limited to 'sys/i386/conf')
-rw-r--r--sys/i386/conf/GENERIC2
-rw-r--r--sys/i386/conf/XBOX6
-rw-r--r--sys/i386/conf/XEN6
3 files changed, 7 insertions, 7 deletions
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)
OpenPOWER on IntegriCloud