From 8c7c4812b2f98e48feb99aab979c69dda2d28b88 Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Mon, 19 Nov 2012 11:19:39 -0800
Subject: [PATCH] Remove vmware easy install leftovers

---
 util/vm/install-mininet-vm.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/util/vm/install-mininet-vm.sh b/util/vm/install-mininet-vm.sh
index 76cad51..9f5e4f0 100755
--- a/util/vm/install-mininet-vm.sh
+++ b/util/vm/install-mininet-vm.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
 
 # This script is intended to install Mininet into
-# a brand-new Ubuntu (10.04 or 11.10) virtual machine,
+# a brand-new Ubuntu virtual machine,
 # to create a fully usable "tutorial" VM.
-
 set -e
 sudo sh -c 'cat >> /etc/sudoers' <<EOF
 openflow ALL=NOPASSWD: ALL
@@ -17,14 +16,23 @@ sudo update-grub
 sudo sed -i -e 's/us.archive.ubuntu.com/mirrors.kernel.org/' \
 	/etc/apt/sources.list
 sudo apt-get update
+# Clean up vmware easy install junk if present
+if [ -e /etc/issue.backup ]; then
+    sudo mv /etc/issue.backup /etc/issue
+fi
+if [ -e /etc/rc.local.backup ]; then
+    sudo mv /etc/rc.local.backup /etc/rc.local
+fi
+# Install Mininet
 sudo apt-get -y install git-core openssh-server
 git clone git://github.com/mininet/mininet
 cd mininet
 cd
 time mininet/util/install.sh
-if ! grep NOX_CORE_DIR .bashrc; then
-  echo "export NOX_CORE_DIR=~/noxcore/build/src/" >> .bashrc
-fi
+# Ignoring this since NOX classic is deprecated
+#if ! grep NOX_CORE_DIR .bashrc; then
+#  echo "export NOX_CORE_DIR=~/noxcore/build/src/" >> .bashrc
+#fi
 echo <<EOF
 You may need to reboot and then:
 sudo dpkg-reconfigure openvswitch-datapath-dkms