[docker-io: 1/2] Remove unneeded sysctl entries, docker 0.8.0 handles this

[Lokesh Mandvekar]

commit ccdf9c544d3910f56dd9a3650c0884c888db9fd9
Author: Adam Miller <admiller(a)redhat.com&gt;
Date:   Thu Feb 13 12:27:50 2014 -0600

    Remove unneeded sysctl entries, docker 0.8.0 handles this

 docker-io.spec  |    6 +++++-
 docker.sysvinit |    5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 48cb5e0..7976363 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -14,7 +14,7 @@
 
 Name:           docker-io
 Version:        0.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Automates deployment of containerized applications
 License:        ASL 2.0
 
@@ -192,6 +192,10 @@ fi
 %{_datadir}/vim/vimfiles/syntax/dockerfile.vim
 
 %changelog
+* Thu Feb 13 2014 Adam Miller <maxamillion(a)fedoraproject.org&gt; - 0.8.0-3
+- Remove unneeded sysctl settings in initscript
+  https://github.com/dotcloud/docker/pull/4125
+
 * Sat Feb 08 2014 Lokesh Mandvekar <lsm5(a)redhat.com&gt; - 0.8.0-2
 - ignore btrfs for rhel7 and clones for now
 - include vim syntax highlighting from contrib/syntax/vim
diff --git a/docker.sysvinit b/docker.sysvinit
index f748fa1..2a43164 100644
--- a/docker.sysvinit
+++ b/docker.sysvinit
@@ -37,11 +37,6 @@ prestart() {
         service cgconfig start
     fi
 
-    preexec="/sbin/sysctl"
-    [ -x $preexec ] || exit 6
-    $preexec -w net.ipv4.ip_forward=1 > /dev/null 2>&1
-    $preexec -w net.ipv6.conf.all.forwarding=1 > /dev/null 2>&1
-
 }
 
 start() {