Allow specification of branch to install

INSTALL

@@ -2,7 +2,7 @@
 Mininet Installation/Configuration Notes
 ----------------------------------------
 
-Mininet 2.1.0+
+Mininet 2.1.0p1
 ---
 
 The supported installation methods for Mininet are 1) using a

LICENSE

@@ -1,4 +1,4 @@
-Mininet 2.1.0+ License
+Mininet 2.1.0p1 License
 
 Copyright (c) 2013 Open Networking Laboratory
 Copyright (c) 2009-2012 Bob Lantz and The Board of Trustees of

README.md

@@ -3,7 +3,7 @@ Mininet: Rapid Prototyping for Software Defined Networks
 
 *The best way to emulate almost any network on your laptop!*
 
-Version 2.1.0+
+Version 2.1.0p1
 
 ### What is Mininet?
 
@@ -66,9 +66,9 @@ Mininet includes:
 
   `mn -c`
 
-### New features in 2.1.0+
+### New features in 2.1.0p1
 
-Mininet 2.1.0+ provides a number of bug fixes as well as
+Mininet 2.1.0p1 provides a number of bug fixes as well as
 several new features, including:
 
 * Convenient access to `Mininet()` as a dict of nodes
@@ -127,7 +127,7 @@ Mininet to change the networking world!
 
 ### Credits
 
-The Mininet 2.1.0+ Team:
+The Mininet 2.1.0p1 Team:
 
 * Bob Lantz
 * Brian O'Connor

mininet/net.py

@@ -102,7 +102,7 @@ from mininet.util import macColonHex, ipStr, ipParse, netParse, ipAdd
 from mininet.term import cleanUpScreens, makeTerms
 
 # Mininet version: should be consistent with README and LICENSE
-VERSION = "2.1.0+"
+VERSION = "2.1.0p1"
 
 class Mininet( object ):
     "Network emulation with hosts spawned in network namespaces."

util/vm/install-mininet-vm.sh

@@ -3,6 +3,8 @@
 # This script is intended to install Mininet into
 # a brand-new Ubuntu virtual machine,
 # to create a fully usable "tutorial" VM.
+#
+# optional argument: Mininet branch to install
 set -e
 echo `whoami` ALL=NOPASSWD: ALL | sudo tee -a /etc/sudoers > /dev/null
 sudo sed -i -e 's/Default/#Default/' /etc/sudoers
@@ -25,11 +27,16 @@ fi
 if [ -e /etc/rc.local.backup ]; then
     sudo mv /etc/rc.local.backup /etc/rc.local
 fi
-# Install Mininet
+# Fetch Mininet
 sudo apt-get -y install git-core openssh-server
 git clone git://github.com/mininet/mininet
-cd mininet
-cd
+# Optionally check out branch
+if [ "$1" != "" ]; then
+  pushd mininet
+  git checkout -b $1 $1
+  popd
+fi
+# Install Mininet
 time mininet/util/install.sh
 # Finalize VM
 time mininet/util/install.sh -tc
@@ -38,4 +45,3 @@ time mininet/util/install.sh -tc
 #  echo "export NOX_CORE_DIR=~/noxcore/build/src/" >> .bashrc
 #fi
 echo "Done preparing Mininet VM."
-