rearranging
diff --git a/onos-setup-lxc.sh b/onos-setup-lxc.sh
index 0c72b63..0f82070 100644
--- a/onos-setup-lxc.sh
+++ b/onos-setup-lxc.sh
@@ -27,60 +27,6 @@
sudo -u $name ssh -o "StrictHostKeyChecking no" sdn@10.0.3.13 ls
}
-# -------------- Install ONOS ----------------
-
-USER=mininet
-USER_HOME=/home/${USER}
-
-echo `whoami`
-
-cd ~
-git clone https://gerrit.onosproject.org/onos
-cd onos && git checkout onos-1.1 && cd -
-
-mkdir -p ~/Downloads
-
-echo "export ONOS_ROOT=${USER_HOME}/onos" >> ~/.bashrc
-echo ". ~/onos/tools/dev/bash_profile" >> ~/.bashrc
-
-export ONOS_ROOT=${USER_HOME}/onos
-. ~/onos/tools/dev/bash_profile
-
-echo $ONOS_ROOT
-
-echo $JAVA_HOME
-export JAVA_HOME=""
-cd $ONOS_ROOT && mvn clean install && mvn dependency:go-offline && cd -
-
-cat << EOF >> onos/tools/test/cells/3node
-export ONOS_NIC=10.0.3.*
-export OC1="10.0.3.11"
-export OC2="10.0.3.12"
-export OC3="10.0.3.13"
-export OCI="${OC1}"
-export ONOS_FEATURES="webconsole,onos-rest,onos-gui,onos-api,onos-core,onos-cli,onos-openflow"
-export ONOS_USER="sdn"
-EOF
-
-cat << EOF >> onos/tools/test/cells/1node
-export ONOS_NIC=10.0.3.*
-export OC1="10.0.3.11"
-export OCI="${OC1}"
-export ONOS_FEATURES="webconsole,onos-rest,onos-gui,onos-api,onos-core,onos-cli,onos-openflow"
-export ONOS_USER="sdn"
-EOF
-
-cell 3node
-
-onos-package
-onos-group install -f
-onos-wait-for-start $OC1
-onos-wait-for-start $OC2
-onos-wait-for-start $OC3
-
-sleep 20
-onos-service --cell status
-
# ------------- Set up desktop environment -------------
# Remove kernel boot options that will prevent the gui from running
@@ -120,9 +66,75 @@
xset -dpms
EOF
+echo $PATH
+
+# -------------- Install ONOS ----------------
+
+USER=mininet
+USER_HOME=/home/${USER}
+
+echo `whoami`
+
+cd ~
+git clone https://gerrit.onosproject.org/onos
+cd onos && git checkout onos-1.1 && cd -
+
+mkdir -p ~/Downloads
+
+echo $PATH
+
+echo "export ONOS_ROOT=${USER_HOME}/onos" >> ~/.bashrc
+echo ". ~/onos/tools/dev/bash_profile" >> ~/.bashrc
+
+export ONOS_ROOT=${USER_HOME}/onos
+. ~/onos/tools/dev/bash_profile
+
+echo $PATH
+
+echo $ONOS_ROOT
+
+echo $JAVA_HOME
+export JAVA_HOME=""
+cd $ONOS_ROOT && mvn clean install && mvn dependency:go-offline && cd -
+
+cat << EOF >> onos/tools/test/cells/3node
+export ONOS_NIC=10.0.3.*
+export OC1="10.0.3.11"
+export OC2="10.0.3.12"
+export OC3="10.0.3.13"
+export OCI="${OC1}"
+export ONOS_FEATURES="webconsole,onos-rest,onos-gui,onos-api,onos-core,onos-cli,onos-openflow"
+export ONOS_USER="sdn"
+EOF
+
+cat << EOF >> onos/tools/test/cells/1node
+export ONOS_NIC=10.0.3.*
+export OC1="10.0.3.11"
+export OCI="${OC1}"
+export ONOS_FEATURES="webconsole,onos-rest,onos-gui,onos-api,onos-core,onos-cli,onos-openflow"
+export ONOS_USER="sdn"
+EOF
+
+cell 3node
+
+echo $PATH
+
+onos-package
+onos-group install -f
+onos-wait-for-start $OC1
+onos-wait-for-start $OC2
+onos-wait-for-start $OC3
+
+sleep 20
+onos-service --cell status
+
+echo $PATH
+
# ------------- Set up each tutorial -------------
create_user tutorial1 "Basic ONOS Tutorial"
+
+URL='https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/new-onos-tutorial;f=tutorial1-setup-lxc.sh'
wget -O tutorial1-setup-lxc.sh $URL
sudo -u ${CURRENT_USER} -H sh -c 'cp tutorial1-setup-lxc.sh ~/ && cd ~/ && sh tutorial1-setup-lxc.sh'