From f52edfc5454a010e7348132acda9e31c1d37c6de Mon Sep 17 00:00:00 2001
From: Brandon Heller <brandonh@stanford.edu>
Date: Sun, 31 Jan 2010 06:58:02 -0800
Subject: [PATCH] Move sysctl params to separate file

Simplifies installation step
---
 INSTALL      | 24 ++++--------------------
 sysctl_addon | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 sysctl_addon

diff --git a/INSTALL b/INSTALL
index cf47bde..1542ee4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -59,31 +59,15 @@ Preliminary Mininet Installation/Configuration Notes
   upon, and an example provided, in the future.)
   
 - For scalable configurations, you might need to increase some of your
-  kernel limits. For example, you could add something like the following
-  to /etc/sysctl.conf (modified as necessary for your desired 
+  kernel limits. Sample params are in sysctl_addon, which can be appended to
+  /etc/sysctl.conf (and modified as necessary for your desired
   configuration):
 
-    # Mininet: Increase open file limit
-    fs.file-max = 100000
-
-    # Mininet: increase network buffer space
-    net.core.wmem_max = 16777216
-    net.core.rmem_max = 16777216
-    net.ipv4.tcp_rmem = 10240 87380 16777216
-    net.ipv4.tcp_rmem = 10240 87380 16777216
-    net.core.netdev_max_backlog = 5000
-
-    # Mininet: increase arp cache size
-    net.ipv4.neigh.default.gc_thresh1 = 4096 
-    net.ipv4.neigh.default.gc_thresh2 = 8192 
-    net.ipv4.neigh.default.gc_thresh3 = 16384
-
-    # Mininet: increase routing table size
-    net.ipv4.route.max_size=32768
+    sudo su -c "cat sysctl_addon >> /etc/sysctl.conf"
 
   To save the config change, run:
 
-    sysctl -p
+    sudo sysctl -p
 
 ---
 
diff --git a/sysctl_addon b/sysctl_addon
new file mode 100644
index 0000000..e26eecc
--- /dev/null
+++ b/sysctl_addon
@@ -0,0 +1,17 @@
+# Mininet: Increase open file limit
+fs.file-max = 100000
+
+# Mininet: increase network buffer space
+net.core.wmem_max = 16777216
+net.core.rmem_max = 16777216
+net.ipv4.tcp_rmem = 10240 87380 16777216
+net.ipv4.tcp_rmem = 10240 87380 16777216
+net.core.netdev_max_backlog = 5000
+
+# Mininet: increase arp cache size
+net.ipv4.neigh.default.gc_thresh1 = 4096 
+net.ipv4.neigh.default.gc_thresh2 = 8192 
+net.ipv4.neigh.default.gc_thresh3 = 16384
+
+# Mininet: increase routing table size
+net.ipv4.route.max_size=32768