From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Fri, 18 Jan 2008 19:42:04 +0000 (+0000)
Subject: unshare netns and unscrew-up something i did
X-Git-Tag: trellis-2.6.22-Jan-2009~69
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f51f4660a9559c656b9e4085027b4e3c5b1cac40;p=linux-2.6.git

unshare netns and unscrew-up something i did
---

diff --git a/kernel-2.6-planetlab.spec b/kernel-2.6-planetlab.spec
index 3f3f49658..5d17567c2 100644
--- a/kernel-2.6-planetlab.spec
+++ b/kernel-2.6-planetlab.spec
@@ -152,6 +152,7 @@ Patch550: linux-2.6-550-raise-default-nfile-ulimit.patch
 Patch560: linux-2.6-560-mmconf.patch
 Patch570: linux-2.6-570-tagxid.patch
 Patch590: trellis.patch
+Patch591: linux-2.6-591-unshare-netns.patch
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
 
@@ -328,6 +329,7 @@ KERNEL_PREVIOUS=vanilla
 # 
 %if 0%{?_with_netns}
 %ApplyPatch 590
+%ApplyPatch 591
 %endif
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
diff --git a/linux-2.6-591-unshare-netns.patch b/linux-2.6-591-unshare-netns.patch
new file mode 100644
index 000000000..92f73cb57
--- /dev/null
+++ b/linux-2.6-591-unshare-netns.patch
@@ -0,0 +1,22 @@
+--- linux-2.6.22-591/kernel/vserver/space.c.orig	2008-01-02 13:56:26.000000000 -0500
++++ linux-2.6.22-591/kernel/vserver/space.c	2008-01-18 12:10:39.000000000 -0500
+@@ -37,7 +37,8 @@
+ 	.mask = CLONE_NEWNS |
+ 		CLONE_NEWUTS |
+ 		CLONE_NEWIPC |
+-		CLONE_FS
++		CLONE_FS | 
++		CLONE_NEWNET
+ };
+ 
+ 
+--- linux-2.6.22-591/kernel/nsproxy.c.orig	2008-01-02 13:56:37.000000000 -0500
++++ linux-2.6.22-591/kernel/nsproxy.c	2008-01-18 14:39:18.000000000 -0500
+@@ -163,7 +163,6 @@
+ 		return 0;
+ 
+ 	get_nsproxy(old_ns);
+-	return 0;
+ 
+ 	if (!(flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER | CLONE_NEWNET)))
+ 		return 0;