Update install scripts

Don't build NOX and OVS as root.  Also don't nuke kernel src.  Install
newer autoconf needed for OVS install from Deb backports, not src.

util/deb/install_mn_deps.sh

@@ -17,5 +17,4 @@ sudo su -c "cat /home/mininet/mininet/sysctl_addon >> /etc/sysctl.conf"
 sudo sysctl -p
 
 #Reboot to ensure you start with higher limits and verify that the IPv6 module is not loaded, plus there's an unknown issue where you need to reboot before the kernel datapath will get added (sorry).
-sudo reboot
-
+sudo reboot

util/deb/install_nox.sh

@@ -2,12 +2,6 @@
 #Brandon Heller (brandonh@stanford.edu)
 #Install NOX on Debian Lenny
 
-#Install NOX deps:
-sudo apt-get -y install autoconf automake g++ libtool python python-twisted swig libboost1.35-dev libxerces-c2-dev libssl-dev make
-
-#Install NOX optional deps:
-sudo apt-get install -y libsqlite3-dev python-simplejson
-
 #Install NOX:
 git clone git://noxrepo.org/noxcore
 cd noxcore
@@ -19,4 +13,4 @@ make
 #make check
 
 #Add NOX_CORE_DIR env var;; modify ~/.bashrc:
-sudo sed -i -e 's|# for examples$|&\ncomplete -cf sudo|' ~/.bashrc
+sed -i -e 's|# for examples$|&\ncomplete -cf sudo|' ~/.bashrc

util/deb/install_nox_deps.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+#Brandon Heller (brandonh@stanford.edu)
+#Install NOX deps on Debian Lenny
+
+#Install NOX deps:
+sudo apt-get -y install autoconf automake g++ libtool python python-twisted swig libboost1.35-dev libxerces-c2-dev libssl-dev make
+
+#Install NOX optional deps:
+sudo apt-get install -y libsqlite3-dev python-simplejson

util/deb/install_ovs.sh

@@ -2,31 +2,9 @@
 #Brandon Heller (brandonh@stanford.edu)
 #Install OVS on Debian Lenny
 
-#The following files were useful for the install process:
-#OVS INSTALL file:
-#http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=blob_plain;f=INSTALL.Linux;hb=HEAD
-
-#OVS OpenFlow INSTALL file:
-#http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=blob_plain;f=INSTALL.OpenFlow;hb=HEAD
-
-#OVS README file:
-#http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=blob_plain;f=README;hb=HEAD
-
-#Install Autoconf 2.63 from source (a more recent version than that in the Deb repositories is required).  This should be the only extra dependency.
-cd ~/
-wget http://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.bz2
-tar xjf autoconf-2.63.tar.bz2
-cd autoconf-2.63/
-./configure
-make
-sudo make install
-cd ~/
-rm -rf autoconf*
-
 #Install OVS:
 git clone git://openvswitch.org/openvswitch
 cd openvswitch
 ./boot.sh
 ./configure --with-l26=/lib/modules/`uname -r`/build
-make
-sudo make install
+make

util/deb/install_ovs_2.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+#Brandon Heller (brandonh@stanford.edu)
+#Install OVS on Debian Lenny
+
+#Install OVS:
+cd openvswitch
+sudo make install

util/deb/install_ovs_deps.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+#Brandon Heller (brandonh@stanford.edu)
+#Install OVS deps on Debian Lenny
+
+#The following files were useful for the install process:
+#OVS INSTALL file:
+#http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=blob_plain;f=INSTALL.Linux;hb=HEAD
+
+#OVS OpenFlow INSTALL file:
+#http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=blob_plain;f=INSTALL.OpenFlow;hb=HEAD
+
+#OVS README file:
+#http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=blob_plain;f=README;hb=HEAD
+
+#Install Autoconf 2.63+ backport from Debian Backports repo:
+#Instructions from http://backports.org/dokuwiki/doku.php?id=instructions
+sudo apt-get -y install debian-backports-keyring
+sudo su -c "echo 'deb http://www.backports.org/debian lenny-backports main contrib non-free' >> /etc/apt/sources.list"
+sudo apt-get update
+sudo apt-get -y -t lenny-backports install autoconf

util/deb/vm_clean.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+#Brandon Heller (brandonh@stanford.edu)
+#Clean up after VM installation
+
+sudo apt-get clean
+sudo rm -rf /tmp/*
+history -c
+rm ~/.ssh/id_rsa*
+sudo rm ~/.ssh/authorized_keys2
+sudo rm -rf ~/mininet