[Devil-linux-commit] build/scripts/config/linux-2.6 config_linux.nfs, 1.2, 1.3 config_linux.nfsd, 1.2, 1.3

[Serge L. <sma...@us...>]

Update of /cvsroot/devil-linux/build/scripts/config/linux-2.6
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv30490/d/config/linux-2.6

Modified Files:
	config_linux.nfs config_linux.nfsd 
Log Message:

- added nfsv4
- updated ucarp to 1.3
- removed duplicate from quota-tools


Index: config_linux.nfsd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/linux-2.6/config_linux.nfsd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config_linux.nfsd	16 Apr 2006 02:51:49 -0000	1.2
+++ config_linux.nfsd	31 Aug 2007 08:28:24 -0000	1.3
@@ -1,10 +1,16 @@
-CONFIG_NFSD=m
+CONFIG_NFSD=y
+CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
 CONFIG_NFSD_TCP=y
-CONFIG_SUNRPC=m
-CONFIG_LOCKD=m
+CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=n
-CONFIG_RPCSEC_GSS_KRB5=n
-CONFIG_RPCSEC_GSS_SPKM3=n
+CONFIG_EXPORTFS=y
+CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_RPCSEC_GSS_SPKM3=m
+      

Index: config_linux.nfs
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/config/linux-2.6/config_linux.nfs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config_linux.nfs	16 Apr 2006 02:51:49 -0000	1.2
+++ config_linux.nfs	31 Aug 2007 08:28:24 -0000	1.3
@@ -1,8 +1,14 @@
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
 CONFIG_NFS_DIRECTIO=y
-CONFIG_SUNRPC=m
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=n
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_RPCSEC_GSS_SPKM3=m
+