Updated script to build P4 VM

Among other things, build now is not based on the upstream version of
onos-setup-p4-dev, but on the local one.

Change-Id: I270a324152a9349d6a9989aa8b5a38b45e1856d9
diff --git a/tools/dev/p4vm/user-bootstrap.sh b/tools/dev/p4vm/user-bootstrap.sh
index d8f3709..9b19f26 100755
--- a/tools/dev/p4vm/user-bootstrap.sh
+++ b/tools/dev/p4vm/user-bootstrap.sh
@@ -7,11 +7,16 @@
 
 # ONOS
 git clone https://github.com/opennetworkinglab/onos.git
-echo "export ONOS_ROOT=~/onos" >> ~/.bashrc
-echo "source ~/onos/tools/dev/bash_profile" >> ~/.bashrc
+tee -a ~/.profile <<EOF
+
+# ONOS
+export ONOS_ROOT=~/onos
+source ~/onos/tools/dev/bash_profile
+EOF
+source ~/.profile
 
 # Build and install P4 tools
-bash ~/onos/tools/dev/bin/onos-setup-p4-dev
+bash /vagrant/install-p4-tools.sh
 
 # Mininet
 git clone git://github.com/mininet/mininet ~/mininet