From 2416297b128fa787591c08a6e2a74821af226433 Mon Sep 17 00:00:00 2001
From: Daniel Buckmaster <dan.buckmaster@gmail.com>
Date: Sat, 7 Feb 2015 17:03:04 +1100
Subject: [PATCH] Separate GUI config.

---
 Tools/Vagrant/Vagrantfile      | 15 ++++++++++++++-
 Tools/Vagrant/provision-gui.sh |  5 +++++
 Tools/Vagrant/provision.sh     |  6 ------
 3 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 Tools/Vagrant/provision-gui.sh

diff --git a/Tools/Vagrant/Vagrantfile b/Tools/Vagrant/Vagrantfile
index 5614abbe1..8c6d0f381 100644
--- a/Tools/Vagrant/Vagrantfile
+++ b/Tools/Vagrant/Vagrantfile
@@ -1,6 +1,10 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+def gui?
+  !ENV.fetch('GUI', '').empty?
+end
+
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = '2'
 
@@ -8,13 +12,22 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = 'ubuntu/trusty64'
 
   config.vm.provider 'virtualbox' do |vb|
-    #vb.gui = true
     vb.memory = 1024
+    if gui?
+      vb.memory = 2048
+      vb.customize ['modifyvm', :id, '--vram', '256']
+      vb.customize ['modifyvm', :id, '--accelerate3d', 'on']
+      vb.customize ['modifyvm', :id, '--hwvirtex', 'on']
+      vb.gui = true
+    end
   end
 
   config.vm.synced_folder '../../', '/torque'
 
   config.vm.provision :shell, path: 'provision.sh'
+  if gui?
+    config.vm.provision :shell, path: 'provision-gui.sh'
+  end
 
   # config.vm.network 'forwarded_port', guest: 80, host: 8080
 
diff --git a/Tools/Vagrant/provision-gui.sh b/Tools/Vagrant/provision-gui.sh
new file mode 100644
index 000000000..36ab028a7
--- /dev/null
+++ b/Tools/Vagrant/provision-gui.sh
@@ -0,0 +1,5 @@
+# Install Unity desktop for GUI purposes.
+apt-get install --no-install-recommends \
+	ubuntu-desktop \
+	gnome-terminal \
+	-y
diff --git a/Tools/Vagrant/provision.sh b/Tools/Vagrant/provision.sh
index ed551091c..cec4b6938 100644
--- a/Tools/Vagrant/provision.sh
+++ b/Tools/Vagrant/provision.sh
@@ -1,12 +1,6 @@
 # Make sure package listings are up to date.
 apt-get update -y
 
-# Install Unity desktop for GUI purposes.
-#apt-get install --no-install-recommends \
-#	ubuntu-desktop \
-#	gnome-terminal \
-#	-y
-
 # Install software for development.
 sudo apt-get install \
 	git \