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/Vagrantfile b/tools/dev/p4vm/Vagrantfile
index 0157bf2..259e380 100644
--- a/tools/dev/p4vm/Vagrantfile
+++ b/tools/dev/p4vm/Vagrantfile
@@ -1,7 +1,11 @@
P4_VM_TYPE = ENV['P4_VM_TYPE'] || "dev"
Vagrant.configure(2) do |config|
- config.vm.box = "bento/ubuntu-16.04"
+ if P4_VM_TYPE == "tutorial"
+ config.vm.box = "fso/xenial64-desktop"
+ else
+ config.vm.box = "bento/ubuntu-16.04"
+ end
config.vm.provider "virtualbox" do |vb|
vb.name = "ONOS+P4 " + P4_VM_TYPE + " " + Time.now.strftime("(%Y-%m-%d)")
vb.gui = true
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} \
diff --git a/tools/dev/p4vm/tutorial-bootstrap.sh b/tools/dev/p4vm/tutorial-bootstrap.sh
index 2028c78..8f4b5b8 100755
--- a/tools/dev/p4vm/tutorial-bootstrap.sh
+++ b/tools/dev/p4vm/tutorial-bootstrap.sh
@@ -6,6 +6,41 @@
set -xe
+# Remove unneeded software
+sudo apt-get remove -y --purge \
+ libreoffice* \
+ account-plugin-aim \
+ account-plugin-facebook \
+ account-plugin-flickr \
+ account-plugin-jabber \
+ account-plugin-salut \
+ account-plugin-yahoo \
+ aisleriot \
+ gnome-mahjongg \
+ gnome-mines \
+ gnome-sudoku \
+ landscape-client-ui-install \
+ unity-lens-music \
+ unity-lens-photos \
+ unity-lens-video \
+ unity-scope-audacious \
+ unity-scope-chromiumbookmarks \
+ unity-scope-clementine \
+ unity-scope-colourlovers \
+ unity-scope-devhelp \
+ unity-scope-firefoxbookmarks \
+ unity-scope-gmusicbrowser \
+ unity-scope-gourmet \
+ unity-scope-musicstores \
+ unity-scope-musique \
+ unity-scope-openclipart \
+ unity-scope-texdoc \
+ unity-scope-tomboy \
+ unity-scope-video-remote \
+ unity-scope-virtualbox \
+ unity-scope-zotero \
+ unity-webapps-common
+
sudo add-apt-repository ppa:webupd8team/sublime-text-3 -y
sudo add-apt-repository ppa:webupd8team/atom -y
sudo apt-get update
@@ -15,21 +50,19 @@
sudo DEBIAN_FRONTEND=noninteractive dpkg-reconfigure wireshark-common
sudo apt-get -y --no-install-recommends install \
- lubuntu-desktop \
atom \
sublime-text-installer \
- vim \
- wget
+ vim
# Disable screensaver
-sudo apt-get -y remove light-locker
+gsettings set org.gnome.desktop.screensaver lock-delay 3600
+gsettings set org.gnome.desktop.screensaver lock-enabled false
+gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
# Automatically log into the SDN user
-cat << EOF | sudo tee -a /etc/lightdm/lightdm.conf.d/10-lightdm.conf
+cat << EOF | sudo tee /etc/lightdm/lightdm.conf
[SeatDefaults]
autologin-user=sdn
-autologin-user-timeout=0
-user-session=Lubuntu
EOF
# Vim
@@ -55,18 +88,7 @@
DESKTOP=/home/sdn/Desktop
mkdir -p ${DESKTOP}
-cat > ${DESKTOP}/Terminal << EOF
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Terminal
-Name[en_US]=Terminal
-Icon=konsole
-Exec=/usr/bin/x-terminal-emulator
-Comment[en_US]=
-EOF
-
-cat > ${DESKTOP}/Wireshark << EOF
+cat > ${DESKTOP}/Wireshark.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
Type=Application
@@ -77,7 +99,7 @@
Comment[en_US]=
EOF
-cat > ${DESKTOP}/Sublime\ Text << EOF
+cat > ${DESKTOP}/Sublime\ Text.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
Type=Application
@@ -88,7 +110,7 @@
Comment[en_US]=
EOF
-cat > ${DESKTOP}/Atom << EOF
+cat > ${DESKTOP}/Atom.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
Type=Application
@@ -98,3 +120,5 @@
Exec=/usr/bin/atom
Comment[en_US]=
EOF
+
+chmod +x ${DESKTOP}/*.desktop