veewee 0.1.22 → 0.1.23

data/templates/opensuse-11.4-i386-experimental/definition.rb

@@ -0,0 +1,31 @@
+Veewee::Session.declare({
+  :cpu_count => '1', :memory_size=> '384', 
+  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
+  :os_type_id => 'OpenSUSE',
+  :iso_file => "openSUSE-11.4-DVD-i586.iso",
+  :iso_src => "http://download.opensuse.org/distribution/11.4/iso/openSUSE-11.4-DVD-i586.iso",
+  #:iso_src => "http://ftp.belnet.be/mirror/ftp.opensuse.org/distribution/11.4/iso/openSUSE-11.4-DVD-i586.iso",
+  :iso_md5 => "5f6d6d67c3e256b2513311f4ed650515",
+  :iso_download_timeout => "1000",
+  :boot_wait => "10", :boot_cmd_sequence => [
+    '<Esc><Enter>',
+    'linux',
+    #'/install/vmlinuz noapic preseed/url=http://%IP%:%PORT%/preseed.cfg ',
+    ' netdevice=eth0',
+    ' netsetup=dhcp',
+    ' instmode=dvd',
+    #' install=file://mnt/suse',
+    ' textmode=1 autoyast=http://%IP%:%PORT%/autoinst.xml',
+    #'hostname=%NAME% ',
+    #'initrd=/install/initrd.gz -- <Enter>'
+    '<Enter>'
+   ],
+  :kickstart_port => "7122", :kickstart_timeout => "10000", 
+  #We need this twice, as it is read twice
+  :kickstart_file => ["autoinst.xml","autoinst.xml"],
+  :ssh_login_timeout => "10000", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
+  :ssh_host_port => "7222", :ssh_guest_port => "22",
+  :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
+  :shutdown_cmd => "shutdown -P now",
+  :postinstall_files => [ "postinstall.sh"], :postinstall_timeout => "10000"
+})

data/templates/opensuse-11.4-i386-experimental/postinstall.sh

@@ -0,0 +1,89 @@
+#Inspired by https://github.com/fnichol/wiki-notes/wiki/Creating-An-openSUSE-11.3-x32-Vagrant-Box
+
+
+zypper --non-interactive refresh
+# zypper --non-interactive up
+
+# /sbin/shutdown -r now && exit
+# Install VirtualBox Guest Additions
+# Install some pre-requisites needed for the Guest Additions package and remove the system-installed package:
+zypper --non-interactive install make gcc
+zypper --non-interactive install kernel-default-devel
+zypper --non-interactive remove virtualbox-ose-guest-kmp-default \
+  virtualbox-ose-guest-tools xorg-x11-driver-virtualbox-ose
+
+# Fix remote login
+echo 'UseDNS no' >> /etc/ssh/sshd_config
+
+#install ruby
+zypper --non-interactive install ruby ruby-devel rubygems
+gem install chef --no-ri --no-rdoc
+gem install puppet --no-ri --no-rdoc
+sudo zypper --non-interactive refresh
+sudo zypper --non-interactive up
+#
+#/sbin/shutdown -hP now && exit
+
+
+#Installing vagrant keys
+zypper --non-interactive install wget
+mkdir /home/vagrant/.ssh
+chmod 700 /home/vagrant/.ssh
+cd /home/vagrant/.ssh
+wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
+chown -R vagrant /home/vagrant/.ssh
+
+#Installing the virtualbox guest additions
+VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
+cd /tmp
+wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso
+mount -o loop VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
+sh /mnt/VBoxLinuxAdditions.run
+umount /mnt
+
+rm VBoxGuestAdditions_$VBOX_VERSION.iso
+exit
+
+
+
+sudo zypper --non-interactive refresh
+sudo zypper --non-interactive up
+sudo /sbin/shutdown -r now && exit
+Install VirtualBox Guest Additions
+Install some pre-requisites needed for the Guest Additions package and remove the system-installed package:
+sudo zypper --non-interactive install make gcc
+sudo zypper --non-interactive install kernel-default-devel
+sudo zypper --non-interactive remove virtualbox-ose-guest-kmp-default \
+  virtualbox-ose-guest-tools xorg-x11-driver-virtualbox-ose
+Now mount the Guest Additions from the Devices -> Install Guest Additions VirtualBox menu. Next, mount the iso and install the additions:
+sudo mkdir -p /media/cdrom
+sudo mount /dev/cdrom /media/cdrom
+(cd /media/cdrom && sudo sh VBoxLinuxAdditions.run)
+sudo umount /media/cdrom
+Note: The installer will complain about not finding "the X.Org or XFree86 Window System" which is fine and expected.
+Remove the disk from the virtual drive by clicking the CD-ROM icon and choosing from the flyout menu.
+Prepare SSH Configuration
+Install the public key that Vagrant uses when SSHing into the virtual machine:
+sudo zypper --non-interactive install curl
+mkdir -p ~/.ssh
+chmod 0700 ~/.ssh
+curl -o ~/.ssh/authorized_keys \
+  https://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub
+chmod 0600 ~/.ssh/authorized_keys 
+Edit the sshd configuration to prevent DNS resolution (speedup logins):
+sudo bash -c "echo 'UseDNS no' >> /etc/ssh/sshd_config"
+Install Ruby, Chef, And Puppet
+Thankfully, openSUSE comes with a decently up to date ruby (1.8.7) and a non-crippled rubygems (currently 1.3.7), so this is straight forward:
+sudo zypper --non-interactive install ruby ruby-devel rubygems
+Install the chef and puppet gems so they are ready for the provisioners:
+sudo gem install chef --no-ri --no-rdoc
+sudo gem install puppet --no-ri --no-rdoc
+Update Message Of The Day
+Modify the message of the day (to match the default Vagrant box):
+sudo bash -c "echo 'Welcome to your Vagrant-built virtual machine.' > /etc/motd"
+Final Cleanup
+Run one last update and cleanup:
+sudo zypper --non-interactive refresh
+sudo zypper --non-interactive up
+Finally, shutdown the virtual machine:
+sudo /sbin/shutdown -hP now && exit

data/templates/solaris-11-express-i386/postinstall.sh

@@ -1,7 +1,7 @@
 # http://projects.puppetlabs.com/projects/1/wiki/Puppet_Solaris
 
 # Add the opencsw package site
-export PATH=/usr/bin/:/usr/sbin:$PATH
+export PATH=/usr/bin:/usr/sbin:$PATH
 
 yes|/usr/sbin/pkgadd -d http://mirror.opencsw.org/opencsw/pkgutil-`uname -p`.pkg all
 
@@ -19,8 +19,8 @@ yes|/usr/sbin/pkgadd -d http://mirror.opencsw.org/opencsw/pkgutil-`uname -p`.pkg
 
 # These are needed to get a compiler working
 # Mainly because chef depends on compiling some native gems
-export PATH=/opt/csw/bin/:$PATH
-export PATH=/opt/csw/gcc4/bin/:$PATH
+export PATH=/opt/csw/bin:$PATH
+export PATH=/opt/csw/gcc4/bin:$PATH
 
 /opt/csw/bin/pkgutil -y -i CSWgcc4core
 
@@ -66,8 +66,8 @@ yes|/usr/sbin/pkgadd -d . SUNWvbox
 
 # Fix the shells to include the /opt/csw directories
 
-echo "export PATH=/opt/csw/bin:/opt/csw/sbin/:$PATH" >> /root/.profile
-echo "export PATH=/opt/csw/bin:/opt/csw/sbin/:$PATH" >> /export/home/vagrant/.profile
+echo "export PATH=/opt/csw/bin:/opt/csw/sbin:$PATH" >> /root/.profile
+echo "export PATH=/opt/csw/bin:/opt/csw/sbin:$PATH" >> /export/home/vagrant/.profile
 
 puts "Note: validation of this box wil fail, as it's not linux based, working on that"
 

data/templates/ubuntu-10.04.2-server-amd64/postinstall.sh

@@ -1,35 +1,58 @@
-#http://adrianbravo.tumblr.com/post/644860401
+# postinstall.sh created from Mitchell's official lucid32/64 baseboxes
 
-#Updating the box
+# Apt-install various things necessary for Ruby, guest additions,
+# etc., and remove optional things to trim down the machine.
 apt-get -y update
+apt-get -y upgrade
 apt-get -y install linux-headers-$(uname -r) build-essential
 apt-get -y install zlib1g-dev libssl-dev libreadline5-dev
 apt-get clean
 
-#Setting up sudo
+# Setup sudo to allow no-password sudo for "admin"
 cp /etc/sudoers /etc/sudoers.orig
+sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers
 sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers
 
-#Installing ruby
-wget http://rubyforge.org/frs/download.php/71096/ruby-enterprise-1.8.7-2010.02.tar.gz
-tar xzvf ruby-enterprise-1.8.7-2010.02.tar.gz
-./ruby-enterprise-1.8.7-2010.02/installer -a /opt/ruby --no-dev-docs --dont-install-useful-gems
-echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/rubyenterprise.sh
-rm -rf ./ruby-enterprise-1.8.7-2010.02/
-rm ruby-enterprise-1.8.7-2010.02.tar.gz
+# Install NFS client
+apt-get -y install nfs-common
 
-#Installing chef & Puppet
+# Install Ruby from source in /opt so that users of Vagrant
+# can install their own Rubies using packages or however.
+# We must install the 1.8.x series since Puppet doesn't support
+# Ruby 1.9 yet.
+wget http://ftp.ruby-lang.org/pub/ruby/ruby-1.8.7-p334.tar.gz
+tar xvzf ruby-1.8.7-p334.tar.gz
+cd ruby-1.8.7-p334
+./configure --prefix=/opt/ruby
+make
+make install
+cd ..
+rm -rf ruby-1.8.7-p334*
+
+# Install RubyGems 1.7.2
+wget http://production.cf.rubygems.org/rubygems/rubygems-1.7.2.tgz
+tar xzf rubygems-1.7.2.tgz
+cd rubygems-1.7.2
+/opt/ruby/bin/ruby setup.rb
+cd ..
+rm -rf rubygems-1.7.2*
+
+# Installing chef & Puppet
 /opt/ruby/bin/gem install chef --no-ri --no-rdoc
 /opt/ruby/bin/gem install puppet --no-ri --no-rdoc
 
-#Installing vagrant keys
+# Add /opt/ruby/bin to the global path as the last resort so
+# Ruby, RubyGems, and Chef/Puppet are visible
+echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/vagrantruby.sh
+
+# Installing vagrant keys
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
 wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chown -R vagrant /home/vagrant/.ssh
 
-#Installing the virtualbox guest additions
+# Installing the virtualbox guest additions
 VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
 cd /tmp
 wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso
@@ -37,8 +60,14 @@ mount -o loop VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
 sh /mnt/VBoxLinuxAdditions.run
 umount /mnt
 
+rm VBoxGuestAdditions_$VBOX_VERSION.iso
+
+# Remove items used for building, since they aren't needed anymore
 apt-get -y remove linux-headers-$(uname -r) build-essential
 apt-get -y autoremove
 
-rm VBoxGuestAdditions_$VBOX_VERSION.iso
-exit
+# Zero out the free space to save space in the final image:
+dd if=/dev/zero of=/EMPTY bs=1M
+rm -f /EMPTY
+
+exit

data/templates/ubuntu-10.04.2-server-i386/postinstall.sh

@@ -1,37 +1,58 @@
-#http://adrianbravo.tumblr.com/post/644860401
+# postinstall.sh created from Mitchell's official lucid32/64 baseboxes
 
-#Updating the box
+# Apt-install various things necessary for Ruby, guest additions,
+# etc., and remove optional things to trim down the machine.
 apt-get -y update
-#apt-get -y upgrade
-apt-get -y remove apparmor
+apt-get -y upgrade
 apt-get -y install linux-headers-$(uname -r) build-essential
 apt-get -y install zlib1g-dev libssl-dev libreadline5-dev
 apt-get clean
 
-#Setting up sudo
+# Setup sudo to allow no-password sudo for "admin"
 cp /etc/sudoers /etc/sudoers.orig
+sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers
 sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers
 
-#Installing ruby
-wget http://rubyforge.org/frs/download.php/71096/ruby-enterprise-1.8.7-2010.02.tar.gz
-tar xzvf ruby-enterprise-1.8.7-2010.02.tar.gz
-./ruby-enterprise-1.8.7-2010.02/installer -a /opt/ruby --no-dev-docs --dont-install-useful-gems
-echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/rubyenterprise.sh
-rm -rf ./ruby-enterprise-1.8.7-2010.02/
-rm ruby-enterprise-1.8.7-2010.02.tar.gz
+# Install NFS client
+apt-get -y install nfs-common
 
-#Installing chef & Puppet
+# Install Ruby from source in /opt so that users of Vagrant
+# can install their own Rubies using packages or however.
+# We must install the 1.8.x series since Puppet doesn't support
+# Ruby 1.9 yet.
+wget http://ftp.ruby-lang.org/pub/ruby/ruby-1.8.7-p334.tar.gz
+tar xvzf ruby-1.8.7-p334.tar.gz
+cd ruby-1.8.7-p334
+./configure --prefix=/opt/ruby
+make
+make install
+cd ..
+rm -rf ruby-1.8.7-p334*
+
+# Install RubyGems 1.7.2
+wget http://production.cf.rubygems.org/rubygems/rubygems-1.7.2.tgz
+tar xzf rubygems-1.7.2.tgz
+cd rubygems-1.7.2
+/opt/ruby/bin/ruby setup.rb
+cd ..
+rm -rf rubygems-1.7.2*
+
+# Installing chef & Puppet
 /opt/ruby/bin/gem install chef --no-ri --no-rdoc
 /opt/ruby/bin/gem install puppet --no-ri --no-rdoc
 
-#Installing vagrant keys
+# Add /opt/ruby/bin to the global path as the last resort so
+# Ruby, RubyGems, and Chef/Puppet are visible
+echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/vagrantruby.sh
+
+# Installing vagrant keys
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
 wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chown -R vagrant /home/vagrant/.ssh
 
-#Installing the virtualbox guest additions
+# Installing the virtualbox guest additions
 VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
 cd /tmp
 wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso
@@ -40,4 +61,13 @@ sh /mnt/VBoxLinuxAdditions.run
 umount /mnt
 
 rm VBoxGuestAdditions_$VBOX_VERSION.iso
-exit
+
+# Remove items used for building, since they aren't needed anymore
+apt-get -y remove linux-headers-$(uname -r) build-essential
+apt-get -y autoremove
+
+# Zero out the free space to save space in the final image:
+dd if=/dev/zero of=/EMPTY bs=1M
+rm -f /EMPTY
+
+exit

data/templates/ubuntu-10.10-server-amd64-netboot/postinstall.sh

@@ -1,37 +1,58 @@
-#http://adrianbravo.tumblr.com/post/644860401
+# postinstall.sh created from Mitchell's official lucid32/64 baseboxes
 
-#Updating the box
+# Apt-install various things necessary for Ruby, guest additions,
+# etc., and remove optional things to trim down the machine.
 apt-get -y update
-#apt-get -y upgrade
-apt-get -y remove apparmor
+apt-get -y upgrade
 apt-get -y install linux-headers-$(uname -r) build-essential
 apt-get -y install zlib1g-dev libssl-dev libreadline5-dev
 apt-get clean
 
-#Setting up sudo
+# Setup sudo to allow no-password sudo for "admin"
 cp /etc/sudoers /etc/sudoers.orig
+sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers
 sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers
 
-#Installing ruby
-wget http://rubyforge.org/frs/download.php/71096/ruby-enterprise-1.8.7-2010.02.tar.gz
-tar xzvf ruby-enterprise-1.8.7-2010.02.tar.gz
-./ruby-enterprise-1.8.7-2010.02/installer -a /opt/ruby --no-dev-docs --dont-install-useful-gems
-echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/rubyenterprise.sh
-rm -rf ./ruby-enterprise-1.8.7-2010.02/
-rm ruby-enterprise-1.8.7-2010.02.tar.gz
+# Install NFS client
+apt-get -y install nfs-common
 
-#Installing chef & Puppet
+# Install Ruby from source in /opt so that users of Vagrant
+# can install their own Rubies using packages or however.
+# We must install the 1.8.x series since Puppet doesn't support
+# Ruby 1.9 yet.
+wget http://ftp.ruby-lang.org/pub/ruby/ruby-1.8.7-p334.tar.gz
+tar xvzf ruby-1.8.7-p334.tar.gz
+cd ruby-1.8.7-p334
+./configure --prefix=/opt/ruby
+make
+make install
+cd ..
+rm -rf ruby-1.8.7-p334*
+
+# Install RubyGems 1.7.2
+wget http://production.cf.rubygems.org/rubygems/rubygems-1.7.2.tgz
+tar xzf rubygems-1.7.2.tgz
+cd rubygems-1.7.2
+/opt/ruby/bin/ruby setup.rb
+cd ..
+rm -rf rubygems-1.7.2*
+
+# Installing chef & Puppet
 /opt/ruby/bin/gem install chef --no-ri --no-rdoc
 /opt/ruby/bin/gem install puppet --no-ri --no-rdoc
 
-#Installing vagrant keys
+# Add /opt/ruby/bin to the global path as the last resort so
+# Ruby, RubyGems, and Chef/Puppet are visible
+echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/vagrantruby.sh
+
+# Installing vagrant keys
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
 wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chown -R vagrant /home/vagrant/.ssh
 
-#Installing the virtualbox guest additions
+# Installing the virtualbox guest additions
 VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
 cd /tmp
 wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso
@@ -40,4 +61,13 @@ sh /mnt/VBoxLinuxAdditions.run
 umount /mnt
 
 rm VBoxGuestAdditions_$VBOX_VERSION.iso
-exit
+
+# Remove items used for building, since they aren't needed anymore
+apt-get -y remove linux-headers-$(uname -r) build-essential
+apt-get -y autoremove
+
+# Zero out the free space to save space in the final image:
+dd if=/dev/zero of=/EMPTY bs=1M
+rm -f /EMPTY
+
+exit

data/templates/ubuntu-10.10-server-amd64/postinstall.sh

@@ -1,37 +1,58 @@
-#http://adrianbravo.tumblr.com/post/644860401
+# postinstall.sh created from Mitchell's official lucid32/64 baseboxes
 
-#Updating the box
+# Apt-install various things necessary for Ruby, guest additions,
+# etc., and remove optional things to trim down the machine.
 apt-get -y update
-#apt-get -y upgrade
-apt-get -y remove apparmor
+apt-get -y upgrade
 apt-get -y install linux-headers-$(uname -r) build-essential
 apt-get -y install zlib1g-dev libssl-dev libreadline5-dev
 apt-get clean
 
-#Setting up sudo
+# Setup sudo to allow no-password sudo for "admin"
 cp /etc/sudoers /etc/sudoers.orig
+sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers
 sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers
 
-#Installing ruby
-wget http://rubyforge.org/frs/download.php/71096/ruby-enterprise-1.8.7-2010.02.tar.gz
-tar xzvf ruby-enterprise-1.8.7-2010.02.tar.gz
-./ruby-enterprise-1.8.7-2010.02/installer -a /opt/ruby --no-dev-docs --dont-install-useful-gems
-echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/rubyenterprise.sh
-rm -rf ./ruby-enterprise-1.8.7-2010.02/
-rm ruby-enterprise-1.8.7-2010.02.tar.gz
+# Install NFS client
+apt-get -y install nfs-common
 
-#Installing chef & Puppet
+# Install Ruby from source in /opt so that users of Vagrant
+# can install their own Rubies using packages or however.
+# We must install the 1.8.x series since Puppet doesn't support
+# Ruby 1.9 yet.
+wget http://ftp.ruby-lang.org/pub/ruby/ruby-1.8.7-p334.tar.gz
+tar xvzf ruby-1.8.7-p334.tar.gz
+cd ruby-1.8.7-p334
+./configure --prefix=/opt/ruby
+make
+make install
+cd ..
+rm -rf ruby-1.8.7-p334*
+
+# Install RubyGems 1.7.2
+wget http://production.cf.rubygems.org/rubygems/rubygems-1.7.2.tgz
+tar xzf rubygems-1.7.2.tgz
+cd rubygems-1.7.2
+/opt/ruby/bin/ruby setup.rb
+cd ..
+rm -rf rubygems-1.7.2*
+
+# Installing chef & Puppet
 /opt/ruby/bin/gem install chef --no-ri --no-rdoc
 /opt/ruby/bin/gem install puppet --no-ri --no-rdoc
 
-#Installing vagrant keys
+# Add /opt/ruby/bin to the global path as the last resort so
+# Ruby, RubyGems, and Chef/Puppet are visible
+echo 'PATH=$PATH:/opt/ruby/bin/'> /etc/profile.d/vagrantruby.sh
+
+# Installing vagrant keys
 mkdir /home/vagrant/.ssh
 chmod 700 /home/vagrant/.ssh
 cd /home/vagrant/.ssh
 wget --no-check-certificate 'http://github.com/mitchellh/vagrant/raw/master/keys/vagrant.pub' -O authorized_keys
 chown -R vagrant /home/vagrant/.ssh
 
-#Installing the virtualbox guest additions
+# Installing the virtualbox guest additions
 VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
 cd /tmp
 wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso
@@ -40,4 +61,13 @@ sh /mnt/VBoxLinuxAdditions.run
 umount /mnt
 
 rm VBoxGuestAdditions_$VBOX_VERSION.iso
+
+# Remove items used for building, since they aren't needed anymore
+apt-get -y remove linux-headers-$(uname -r) build-essential
+apt-get -y autoremove
+
+# Zero out the free space to save space in the final image:
+dd if=/dev/zero of=/EMPTY bs=1M
+rm -f /EMPTY
+
 exit