SOURCES: nfs.sysconfig, nfsfs.sysconfig - merged from AC-branch

[baggins]

Author: baggins                      Date: Mon May  8 16:00:37 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged from AC-branch

---- Files affected:
SOURCES:
   nfs.sysconfig (1.3 -> 1.4) , nfsfs.sysconfig (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/nfs.sysconfig
diff -u SOURCES/nfs.sysconfig:1.3 SOURCES/nfs.sysconfig:1.4
--- SOURCES/nfs.sysconfig:1.3	Sun Dec  5 02:24:12 2004
+++ SOURCES/nfs.sysconfig	Mon May  8 18:00:32 2006
@@ -2,11 +2,15 @@
 SERVICE_RUN_NICE_LEVEL="+0"
 
 # Customized setings for knfsd
-
-# This is for 2.2 kernel server.
-#RPCMOUNTOPTIONS="--no-nfs-version 3"
+RPCMOUNTOPTIONS=""
 
 RPCNFSDCOUNT=8
 
-# Server type we are running, U for userland NFSD, K for knfsd
-NFSDTYPE=
+# Set it to "yes" if you plan to run NFSv4 server
+NFS4="no"
+
+# Options for NFSv4 ID <-> Name Mapper (idmapd)
+#RPCIDMAPOPTIONS=
+
+# Options for NFSv4 server-side rpcsec_gss daemon
+#RPCSVCGSSOPTIONS=

================================================================
Index: SOURCES/nfsfs.sysconfig
diff -u SOURCES/nfsfs.sysconfig:1.1 SOURCES/nfsfs.sysconfig:1.2
--- SOURCES/nfsfs.sysconfig:1.1	Mon May  8 15:50:43 2006
+++ SOURCES/nfsfs.sysconfig	Mon May  8 18:00:32 2006
@@ -1,5 +1,5 @@
 # Set it to "yes" if you plan to mount NFSv4 shares
-NFSV4="no"
+NFS4="no"
 
 # Options for NFSv4 ID <-> Name Mapper (idmapd)
 #RPCIDMAPOPTIONS=
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/nfs.sysconfig?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/nfsfs.sysconfig?r1=1.1&r2=1.2&f=u