SPECS (LINUX_2_6_22): kernel.spec - handle the AF_RXRPC problem he...

[arekm]

Author: arekm                        Date: Fri Jan 18 13:48:17 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_22
---- Log message:
- handle the AF_RXRPC problem here instead in kernel*.config files

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1796.2.40 -> 1.441.2.1796.2.41) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1796.2.40 SPECS/kernel.spec:1.441.2.1796.2.41
--- SPECS/kernel.spec:1.441.2.1796.2.40	Fri Jan 18 13:29:59 2008
+++ SPECS/kernel.spec	Fri Jan 18 14:48:12 2008
@@ -1199,6 +1199,15 @@
 	cat %{SOURCE43} >> arch/%{_target_base_arch}/defconfig
 %if %{with vs22}
 	sed -i "s:CONFIG_IPV6=y:CONFIG_IPV6=m:" arch/%{_target_base_arch}/defconfig
+%else
+	# 13:53 < daniel_hozac> arekm: it requires a feature that conflicts with Linux-VServer.
+	# 13:54 < arekm> daniel_hozac: conflicts on which level? compile, usage? previous patch didn't have this problem visible
+	# 13:55 < Bertl> arekm: 2.6.24 will have that fixed, utilizing user namespaces, for 2.6.22, we cannot allow to enable key
+	#		 retention support because of missing virtualization
+	# 13:55 < daniel_hozac> arekm: usage, security wise.
+	# 13:55 < daniel_hozac> arekm: also limits the number of guests you can run to 50.
+	sed -i 's:CONFIG_AFS_FS=m:# CONFIG_AFS_FS is not set:' arch/%{_target_base_arch}/defconfig
+	sed -i 's:CONFIG_AF_RXRPC=m:# CONFIG_AF_RXRPC is not set:' arch/%{_target_base_arch}/defconfig
 %endif
 %endif
 
@@ -1739,6 +1748,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1796.2.41  2008-01-18 13:48:12  arekm
+- handle the AF_RXRPC problem here instead in kernel*.config files
+
 Revision 1.441.2.1796.2.40  2008-01-18 12:29:59  arekm
 - rel 4; vserver up to 2.3.0.29.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1796.2.40&r2=1.441.2.1796.2.41&f=u