polishing
diff --git a/dist-setup.sh b/dist-setup.sh
index c87f870..a48881c 100644
--- a/dist-setup.sh
+++ b/dist-setup.sh
@@ -7,12 +7,13 @@
export CURRENT_USER=distributed
export USER_HOME=/home/${CURRENT_USER}
+ECLIPSE_URL=http://download.eclipse.org/technology/epp/downloads/release/luna/R/eclipse-java-luna-R-linux-gtk-x86_64.tar.gz
# -------------- Setup keys -------------------
mkdir -p ~/.ssh
-ssh-keygen -t dsa -P "" -f .ssh/id_dsa
-cp .ssh/id_dsa.pub .ssh/authorized_keys
+ssh-keygen -t rsa -P "" -f .ssh/id_rsa
+cp .ssh/id_rsa.pub .ssh/authorized_keys
# -------------- Install Karaf ----------------
@@ -22,6 +23,9 @@
unzip apache-karaf-3.0.2.zip
cd -
+mkdir Downloads
+cp Applications/apache-karaf-3.0.2.zip Downloads/
+
#--------------- Setup Docker env ------------
mkdir -p docker/onos-tutorial
@@ -58,11 +62,12 @@
echo "sudo docker run --name onos-2 -d -P onos/tutorial-dist > /dev/null 2>&1" >> ~/.bashrc
echo "sudo docker run --name onos-3 -d -P onos/tutorial-dist > /dev/null 2>&1" >> ~/.bashrc
+
cat > onos/tools/test/cells/docker << EOF
export ONOS_NIC="172.17.0.*"
-export OC1="eval sudo docker inspect --format '{{ .NetworkSettings.IPAddress }}' onos-1"
-export OC2="eval sudo docker inspect --format '{{ .NetworkSettings.IPAddress }}' onos-2"
-export OC3="eval sudo docker inspect --format '{{ .NetworkSettings.IPAddress }}' onos-3"
+export OC1="\$(sudo docker inspect --format '{{ .NetworkSettings.IPAddress }}' onos-1)"
+export OC2="\$(sudo docker inspect --format '{{ .NetworkSettings.IPAddress }}' onos-2)"
+export OC3="\$(sudo docker inspect --format '{{ .NetworkSettings.IPAddress }}' onos-3)"
export OCN="localhost"
export OCI="${OC1}"
export ONOS_FEATURES="webconsole,onos-api,onos-core,onos-cli,onos-rest,onos-gui,onos-openflow,onos-app-fwd,onos-app-proxyarp,onos-app-mobility"
@@ -129,6 +134,17 @@
mkdir -p ${DESKTOP}
+cat > ${DESKTOP}/Eclipse << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Eclipse
+Name[en_US]=Eclipse
+Icon=/opt/eclipse/icon.xpm
+Exec=/usr/bin/eclipse
+Comment[en_US]=
+EOF
+
cat > ${DESKTOP}/Mininet << EOF
[Desktop Entry]
Encoding=UTF-8
@@ -197,6 +213,13 @@
echo "Installing VirtualBox Guest Additions"
sudo apt-get install -y virtualbox-guest-x11
+sudo apt-get install -y git-review
+
+wget -c -N -O /tmp/eclipse.tar.gz ${ECLIPSE_URL}
+tar xzf /tmp/eclipse.tar.gz
+sudo mv eclipse /opt
+sudo ln -s /opt/eclipse/eclipse /usr/bin/eclipse
+
# ------------- Zero Unused Blocks -------------
#TODO investigate zerofree
echo "Zeroing unused blocks"