commit 01b62f7c465ef54818aab24d1fbe268d32bb9768
author ashu <agawande@memphis.edu> Thu Mar 12 15:16:11 2015 -0500
committer ashu <agawande@memphis.edu> Wed Mar 25 11:25:52 2015 -0500
tree e7b161f0ded519af3e683a5cab671c06c48108b2
parent ef3490b0525aeb89bfc4ab72e07a3fe4525e5a32

Add ndn_utils and modify install script

refs: #2528

Change-Id: I7c26df7c91572f8e48b23ca3cddcec1b8f0216a5

util/install.sh

diff --git a/util/install.sh b/util/install.sh
index 716132d..c16883d 100755
--- a/util/install.sh
+++ b/util/install.sh
@@ -133,13 +133,13 @@
 
     # Add sysctl parameters as noted in the INSTALL file to increase kernel
     # limits to support larger setups:
-    sudo su -c "cat $HOME/mn-ccnx/util/sysctl_addon >> /etc/sysctl.conf"
+    sudo su -c "cat $HOME/mini-ndn/util/sysctl_addon >> /etc/sysctl.conf"
 
     # Load new sysctl settings:
     sudo sysctl -p
 
     echo "Installing Mininet/Mini-CCNx core"
-    pushd ~/mn-ccnx
+    pushd ~/mini-ndn
     sudo make install
     popd
 }
@@ -158,7 +158,7 @@
     cd ~/openflow
 
     # Patch controller to handle more than 16 switches
-    patch -p1 < ~/mn-ccnx/util/openflow-patches/controller.patch
+    patch -p1 < ~/mini-ndn/util/openflow-patches/controller.patch
 
     # Resume the install:
     ./boot.sh
@@ -208,7 +208,7 @@
 
     # Copy coloring rules: OF is white-on-blue:
     mkdir -p ~/.wireshark
-    cp ~/mn-ccnx/util/colorfilters ~/.wireshark
+    cp ~/mini-ndn/util/colorfilters ~/.wireshark
 }
 
 
@@ -357,9 +357,9 @@
 
     # Apply patches
     git checkout -b tutorial-destiny
-    git am ~/mn-ccnx/util/nox-patches/*tutorial-port-nox-destiny*.patch
+    git am ~/mini-ndn/util/nox-patches/*tutorial-port-nox-destiny*.patch
     if [ "$DIST" = "Ubuntu" ] && [ `expr $RELEASE '>=' 12.04` = 1 ]; then
-        git am ~/mn-ccnx/util/nox-patches/*nox-ubuntu12-hacks.patch
+        git am ~/mini-ndn/util/nox-patches/*nox-ubuntu12-hacks.patch
     fi
 
     # Build