Updated tutorial p4vm scripts to build upon Ubuntu Desktop
And not Lubuntu which had u=issues with VirtualBox guest additions
Change-Id: I47218b78ea3d6ae2574fa55166cc48c1de3989e7
diff --git a/tools/dev/p4vm/root-bootstrap.sh b/tools/dev/p4vm/root-bootstrap.sh
index 47fb509..cac34b7 100755
--- a/tools/dev/p4vm/root-bootstrap.sh
+++ b/tools/dev/p4vm/root-bootstrap.sh
@@ -13,7 +13,6 @@
usermod -aG vboxsf sdn
update-locale LC_ALL="en_US.UTF-8"
-
if [ ${VM_TYPE} = "tutorial" ]
then
su sdn <<'EOF'
@@ -22,9 +21,6 @@
EOF
fi
-# Bazel
-wget https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VER}/${BAZEL_DEB}
-
# Java 8
apt-get install software-properties-common -y
add-apt-repository ppa:webupd8team/java -y
@@ -32,6 +28,7 @@
DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" upgrade
+wget https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VER}/${BAZEL_DEB}
echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | debconf-set-selections
apt-get -y --no-install-recommends install \
./${BAZEL_DEB} \