From 81cd3d6063e2e7eca51ccc34432fb590b8f63ab9 Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Wed, 23 Jan 2008 23:59:10 +0000 Subject: [PATCH 1/1] --- kernel-2.6-planetlab.spec | 2 -- ...2.patch => linux-2.6-590-trellis-mm1-netns.patch | 0 linux-2.6-591-unshare-netns.patch | 13 ++----------- 3 files changed, 2 insertions(+), 13 deletions(-) rename linux-2.6-590-trellis-mm1-2.patch => linux-2.6-590-trellis-mm1-netns.patch (100%) diff --git a/kernel-2.6-planetlab.spec b/kernel-2.6-planetlab.spec index 6ecfc42c8..e73224d69 100644 --- a/kernel-2.6-planetlab.spec +++ b/kernel-2.6-planetlab.spec @@ -154,8 +154,6 @@ Patch570: linux-2.6-570-tagxid.patch Patch590: linux-2.6-590-trellis-mm1-netns.patch Patch591: linux-2.6-591-unshare-netns.patch -BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root - %description The kernel package contains the Linux kernel (vmlinuz), the core of any Linux operating system. The kernel handles the basic functions diff --git a/linux-2.6-590-trellis-mm1-2.patch b/linux-2.6-590-trellis-mm1-netns.patch similarity index 100% rename from linux-2.6-590-trellis-mm1-2.patch rename to linux-2.6-590-trellis-mm1-netns.patch diff --git a/linux-2.6-591-unshare-netns.patch b/linux-2.6-591-unshare-netns.patch index 92f73cb57..bf68a7dd8 100644 --- a/linux-2.6-591-unshare-netns.patch +++ b/linux-2.6-591-unshare-netns.patch @@ -1,4 +1,5 @@ ---- linux-2.6.22-591/kernel/vserver/space.c.orig 2008-01-02 13:56:26.000000000 -0500 +diff -Nurb linux-2.6.22-590/kernel/vserver/space.c linux-2.6.22-591/kernel/vserver/space.c +--- linux-2.6.22-590/kernel/vserver/space.c 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 | @@ -10,13 +11,3 @@ }; ---- 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; -- 2.43.0