summaryrefslogtreecommitdiffstats
path: root/sys/ia64
diff options
context:
space:
mode:
authorrmacklem <rmacklem@FreeBSD.org>2011-04-27 17:51:51 +0000
committerrmacklem <rmacklem@FreeBSD.org>2011-04-27 17:51:51 +0000
commit66b402e198b741aaef0494b904ca943e26928dcf (patch)
treeee19f38f0278c8c957f0412e1d8ee665274c8aa4 /sys/ia64
parentcb70a2e3166cf143bb017b92be577d0eef083a1e (diff)
downloadFreeBSD-src-66b402e198b741aaef0494b904ca943e26928dcf.zip
FreeBSD-src-66b402e198b741aaef0494b904ca943e26928dcf.tar.gz
This patch changes head so that the default NFS client is now the new
NFS client (which I guess is no longer experimental). The fstype "newnfs" is now "nfs" and the regular/old NFS client is now fstype "oldnfs". Although mounts via fstype "nfs" will usually work without userland changes, an updated mount_nfs(8) binary is needed for kernels built with "options NFSCL" but not "options NFSCLIENT". Updated mount_nfs(8) and mount(8) binaries are needed to do mounts for fstype "oldnfs". The GENERIC kernel configs have been changed to use options NFSCL and NFSD (the new client and server) instead of NFSCLIENT and NFSSERVER. For kernels being used on diskless NFS root systems, "options NFSCL" must be in the kernel config. Discussed on freebsd-fs@.
Diffstat (limited to 'sys/ia64')
-rw-r--r--sys/ia64/conf/GENERIC4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 9efa94d5..2d8d316 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -43,9 +43,9 @@ options KTRACE # ktrace(1) syscall trace support
options MAC # TrustedBSD MAC Framework
options MD_ROOT # MD usable as root device
options MSDOSFS # MSDOS Filesystem
-options NFSCLIENT # Network Filesystem Client
+options NFSCL # New Network Filesystem Client
options NFSLOCKD # Network Lock Manager
-options NFSSERVER # Network Filesystem Server
+options NFSD # New Network Filesystem Server
options NFS_ROOT # NFS usable as root device
options P1003_1B_SEMAPHORES # POSIX-style semaphores
options PREEMPTION # Enable kernel thread preemption
OpenPOWER on IntegriCloud