adding distribution support
diff --git a/dist-setup.sh b/dist-setup.sh
new file mode 100644
index 0000000..82954a1
--- /dev/null
+++ b/dist-setup.sh
@@ -0,0 +1,188 @@
+#!/bin/bash
+# vm-setup.sh
+#
+# This script installs ONOS dependencies and installs a desktop environment on a Miniet VM.
+
+
+export CURRENT_USER=distributed
+export USER_HOME=/home/${CURRENT_USER}
+
+
+# -------------- Setup keys -------------------
+
+mkdir -p ~/.ssh
+ssh-keygen -t dsa -P "" -f .ssh/id_dsa
+cp .ssh/id_dsa.pub .ssh/authorized_keys
+
+# -------------- Install Karaf ----------------
+
+mkdir Applications
+cd Applications
+wget http://apache.osuosl.org/karaf/3.0.2/apache-karaf-3.0.2.zip
+unzip apache-karaf-3.0.2.zip
+cd -
+
+#--------------- Setup Docker env ------------
+
+mkdir -p docker/onos-tutorial
+cd docker/onos-tutorial
+cat > Dockerfile << EOF
+FROM ubuntu-upstart:14.10
+MAINTAINER Ali Al-Shabibi <ali@onlab.us>
+RUN apt-get update && apt-get install -y openjdk-8-jre openssh-server
+RUN mkdir /var/run/sshd
+RUN echo 'root:onosrocks' | chpasswd
+RUN sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+# SSH login fix. Otherwise user is kicked off after login
+RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
+ENV NOTVISIBLE "in users profile"
+RUN echo "export VISIBLE=now" >> /etc/profile
+EXPOSE 22 6633
+CMD ["/sbin/init"]
+EOF
+
+sudo docker build -t onos/tutorial-dist .
+
+cd -
+
+# -------------- Download ONOS ----------------
+
+git clone https://gerrit.onosproject.org/onos
+
+echo ". ~/onos/tools/dev/bash_profile" >> ~/.bashrc
+echo "export ONOS_USER=root" >> ~/.bashrc
+
+sed -i -e s/sdn/root/ onos/tools/package/debian/onos.conf
+
+cd onos && mvn clean install && cd -
+
+# -------------- Setup Wireshark dissector ----
+
+wget -O openflow.lua "https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=openflow.lua"
+mkdir -p .wireshark/plugins
+mv openflow.lua .wireshark/plugins
+
+
+
+# -------------- Setup Desktop ----------------
+
+sudo apt-get install -y xorg lxde
+
+#TODO: add backgrounds folder
+sudo mkdir -p /usr/share/backgrounds
+#TODO: change background
+# Remove wallpaper, change background color
+sudo sed -i 's/wallpaper_mode=1/wallpaper_mode=0/g' /usr/share/lxde/pcmanfm/LXDE.conf
+sudo sed -i 's/desktop_bg=#000000/desktop_bg=#104187/g' /usr/share/lxde/pcmanfm/LXDE.conf
+
+sudo sed -i 's/lang=1/lang=0/g' /etc/lxdm/default.conf
+sudo sed -i 's/bottom_pane=1/bottom_pane=0/g' /etc/lxdm/default.conf
+sudo sed -i 's/disable=0/disable=1/g' /etc/lxdm/default.conf
+
+
+wget -O onos.png "https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=onos.png"
+sudo cp onos.png /usr/share/backgrounds/default.png
+
+# Automatically start LXDE on login
+echo '[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx' >> ~/.bashrc
+
+# Automatically log into the VM
+#sudo sed -i 's/exec /sbin/getty -8 38400 tty1//g' /etc/init/tty1.conf
+#sudo sed -i '$ d' /etc/init/tty1.conf
+#echo 'exec /bin/login -f bob < /dev/tty1 > /dev/tty1 2>&1' | sudo tee -a /etc/init/tty1.conf
+
+# Disable screensaver
+sudo sed -i '/screensaver/d' /etc/xdg/lxsession/LXDE/autostart
+cat > ${USER_HOME}/.xsessionrc << EOF
+# disable screensaver
+xset s off
+# disable dpms (standby)
+xset -dpms
+EOF
+
+# Change LXTerminal default colors
+#sudo sed -i 's/bgcolor=#000000000000/bgcolor=#ffffffffffff/g' ${USER_HOME}/.config/lxterminal/lxterminal.conf
+#sudo sed -i 's/fgcolor=#aaaaaaaaaaaa/fgcolor=#000000000000/g' ${USER_HOME}/.config/lxterminal/lxterminal.conf
+sudo sed -i 's/bgcolor=#000000000000/bgcolor=#ffffffffffff/g' /usr/share/lxterminal/lxterminal.conf
+sudo sed -i 's/fgcolor=#aaaaaaaaaaaa/fgcolor=#000000000000/g' /usr/share/lxterminal/lxterminal.conf
+
+DESKTOP=${USER_HOME}/Desktop
+
+mkdir -p ${DESKTOP}
+
+cat > ${DESKTOP}/Mininet << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Mininet
+Name[en_US]=Mininet
+Icon=konsole
+Exec=/usr/bin/lxterminal -e 'sudo mn --custom /home/tutorial1/onos/tools/test/topos/tower.py --topo tower --controller remote --mac'
+Comment[en_US]=
+EOF
+
+cat > ${DESKTOP}/Tutorial << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=ONOS Tutorial
+Name[en_US]=ONOS Tutorial
+Icon=internet-web-browser
+Exec=/usr/bin/chromium-browser https://wiki.onosproject.org/display/ONOS/Distributed+ONOS+Tutorial
+Comment[en_US]=
+EOF
+
+cat > ${DESKTOP}/GUI << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=ONOS GUI
+Name[en_US]=ONOS GUI
+Icon=internet-web-browser
+Exec=/usr/bin/chromium-browser http://localhost:8181/onos/ui/index.html#topo
+Comment[en_US]=
+EOF
+
+cat > ${DESKTOP}/Wireshark << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Wireshark
+Name[en_US]=Wireshark
+Icon=wireshark
+Exec=/usr/bin/wireshark
+Comment[en_US]=
+EOF
+
+cat > ${DESKTOP}/Reset << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Reset
+Name[en_US]=Reset
+Icon=konsole
+Exec=/usr/bin/lxterminal -t 'Resetting; please wait' -e 'sudo service onos restart'
+Comment[en_US]=
+EOF
+
+# ------------- Install Other Tools -------------
+sudo apt-get install -y wireshark
+# Enable root-less wireshark and add mininet
+echo "Enabling wireshark group"
+echo "wireshark-common wireshark-common/install-setuid boolean true" | sudo debconf-set-selections
+sudo dpkg-reconfigure -f noninteractive wireshark-common
+sudo usermod -a -G wireshark mininet
+sudo usermod -a -G wireshark tutorial1
+
+
+echo "Installing VirtualBox Guest Additions"
+sudo apt-get install -y virtualbox-guest-x11
+
+# ------------- Zero Unused Blocks -------------
+#TODO investigate zerofree
+echo "Zeroing unused blocks"
+sync
+dd if=/dev/zero of=tmp-zeros
+sync
+rm tmp-zeros
+sync
diff --git a/vm-setup.sh b/vm-setup.sh
index 20f8e11..e93f11b 100644
--- a/vm-setup.sh
+++ b/vm-setup.sh
@@ -6,13 +6,16 @@
export CURRENT_USER=tutorial1
export SDN_IP_USER=sdnip
+export DIST_USER=distributed
export USER_HOME=/home/${CURRENT_USER}
URL='https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=tutorial1-setup.sh'
SDNIP_URL='https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=sdnip-setup.sh'
+DIST_URL='https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=dist-setup.sh'
sudo /usr/sbin/useradd -c "Basic ONOS Tutorial" -d /home/${CURRENT_USER} -U -m -p $(openssl passwd -1 ${CURRENT_USER}) -s /bin/bash ${CURRENT_USER}
sudo /usr/sbin/useradd -c "Basic SDN-IP Tutorial" -d /home/${SDN_IP_USER} -U -m -p $(openssl passwd -1 ${SDN_IP_USER}) -s /bin/bash ${SDN_IP_USER}
+sudo /usr/sbin/useradd -c "Distributed Tutorial" -d /home/${DIST_USER} -U -m -p $(openssl passwd -1 ${DIST_USER}) -s /bin/bash ${DIST_USER}
echo "${CURRENT_USER} ALL=(ALL) NOPASSWD:ALL" >> tutorial1
@@ -24,9 +27,13 @@
sudo chown root:root /etc/sudoers.d/sdnip
+echo "${DIST_USER} ALL=(ALL) NOPASSWD:ALL" >> dist
+sudo cp dist /etc/sudoers.d
+sudo chown root:root /etc/sudoers.d/dist
+
sudo apt-get update
-sudo apt-get install -y git openjdk-8-jdk maven unzip quagga
+sudo apt-get install -y git openjdk-8-jdk maven unzip quaggaa docker.io
sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac
@@ -45,3 +52,7 @@
wget -O sdnip-setup.sh $SDNIP_URL
sudo -u ${SDN_IP_USER} -H sh -c 'cp sdnip-setup.sh ~/ && cd ~/ && sh sdnip-setup.sh'
+
+wget -O dist-setup.sh $DIST_URL
+
+sudo -u ${DIST_USER} -H sh -c 'cp dist-setup.sh ~/ && cd ~/ && sh dist-setup.sh'