Fixed manual boot device choosing in jessie

Removed templates/ no need to duplicate this
Updated Readme, including downloads move to hashicorp

13 files changed, 3 insertions, 547 deletions

diff --git a/README.md b/README.md
index a8c375a..e6aacd5 100644
--- a/README.md
+++ b/README.md
@@ -15,10 +15,7 @@ time the system was built.
 Download pre-built baseboxes
 ============================
 
-Since GitHub retired its downloads area, you will now have to find baseboxes
-built from these definitions at [LEAP](http://download.leap.se/).
-You'll find Debian Wheezy baseboxes for Virtualbox and KVM.
-
+Hashicorp's Atlas makes both hosting and versioining of baseboxes straightforward. You can find the ones we build from these definitions at [LEAP's account:](https://atlas.hashicorp.com/LEAP). Wheezy is what we focus on now, Jessie needs some work. You'll find there baseboxes for Virtualbox and KVM (libvirt). Signed checksums are at (https://downloads.leap.se/platform/).
 
 Build basebox yourself
 ======================
@@ -60,4 +57,3 @@ Issues
 
 * Libvirt images (KVM) are a lot larger as the Virtualbox ones (up to 1,5GB)
   see https://github.com/jedi4ever/veewee/issues/
-* jessie: you need to manually choose the boot device for grub
diff --git a/definitions/jessie/preseed.cfg b/definitions/jessie/preseed.cfg
index a0613c7..7c84740 100644
--- a/definitions/jessie/preseed.cfg
+++ b/definitions/jessie/preseed.cfg
@@ -255,6 +255,8 @@ d-i grub-installer/with_other_os boolean true
 #d-i grub-installer/bootdev  string (hd0,0)
 # To install grub to multiple disks:
 #d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)
+# see Debian bug #759737 
+d-i grub-installer/bootdev string default
 
 # Optional password for grub, either in clear text
 #d-i grub-installer/password password r00tme
diff --git a/templates/Debian-8.0-amd64-netboot/base.sh b/templates/Debian-8.0-amd64-netboot/base.sh
deleted file mode 100644
index e3642f1..0000000
--- a/templates/Debian-8.0-amd64-netboot/base.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-# Update the box
-apt-get -y update
-apt-get -y install linux-headers-$(uname -r) build-essential
-apt-get -y install zlib1g-dev libssl-dev libreadline-gplv2-dev
-apt-get -y install curl unzip
-
-# Set up sudo
-echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant
-
-# Tweak sshd to prevent DNS resolution (speed up logins)
-echo 'UseDNS no' >> /etc/ssh/sshd_config
-
-# Remove 5s grub timeout to speed up booting
-cat <<EOF > /etc/default/grub
-# If you change this file, run 'update-grub' afterwards to update
-# /boot/grub/grub.cfg.
-
-GRUB_DEFAULT=0
-GRUB_TIMEOUT=0
-GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
-GRUB_CMDLINE_LINUX_DEFAULT="quiet"
-GRUB_CMDLINE_LINUX="debian-installer=en_US"
-EOF
-
-update-grub
diff --git a/templates/Debian-8.0-amd64-netboot/chef.sh b/templates/Debian-8.0-amd64-netboot/chef.sh
deleted file mode 100644
index cd11958..0000000
--- a/templates/Debian-8.0-amd64-netboot/chef.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-if [ -f .veewee_params ]
-then
-  . .veewee_params
-fi
-
-# Default to Gem install
-if [ -z "$CHEF_INSTALLMETHOD" ]; then
-  export CHEF_INSTALLMETHOD="gems"
-fi
-
-# Installing chef
-case $CHEF_INSTALLMETHOD in
-  "gems")
-    # Using gems
-    if [ -z "$CHEF_VERSION" ]; then
-      # Default to latest
-      gem install chef --no-ri --no-rdoc
-    else
-      gem install chef --no-ri --no-rdoc --version $CHEF_VERSION
-    fi
-    ;;
-
-  "omnibus")
-    # Using omnibus
-    if [ -z "$CHEF_VERSION" ]; then
-      # Default to latest
-      wget -O - http://opscode.com/chef/install.sh | sudo bash -s
-    else
-      wget -O - http://opscode.com/chef/install.sh | sudo bash -s -- -v $CHEF_VERSION
-    fi
-    ;;
-
-  "package")
-    # Using packages
-    apt-get install -y debconf-utils
-    echo "chef    chef/chef_server_url    string  $CHEF_SERVER_URL" | debconf-set-selections
-    if [ -z "$CHEF_VERSION" ]; then
-      # Default to latest
-      apt-get install -y chef
-    else
-      apt-get install -y chef=$CHEF_VERSION
-    fi
-    ;;
-
-  *)
-    echo "Unsupported method for installing chef"
-    exit -1
-    ;;
-esac
diff --git a/templates/Debian-8.0-amd64-netboot/cleanup.sh b/templates/Debian-8.0-amd64-netboot/cleanup.sh
deleted file mode 100644
index f6953e1..0000000
--- a/templates/Debian-8.0-amd64-netboot/cleanup.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# Clean up
-apt-get -y remove linux-headers-$(uname -r) build-essential
-apt-get -y autoremove
-apt-get -y clean
-
-# Removing leftover leases and persistent rules
-echo "cleaning up dhcp leases"
-rm /var/lib/dhcp/*
-
-# Make sure Udev doesn't block our network
-echo "cleaning up udev rules"
-rm /etc/udev/rules.d/70-persistent-net.rules
-mkdir /etc/udev/rules.d/70-persistent-net.rules
-rm -rf /dev/.udev/
-rm /lib/udev/rules.d/75-persistent-net-generator.rules
-
-echo "Adding a 2 sec delay to the interface up, to make the dhclient happy"
-echo "pre-up sleep 2" >> /etc/network/interfaces
diff --git a/templates/Debian-8.0-amd64-netboot/definition.rb b/templates/Debian-8.0-amd64-netboot/definition.rb
deleted file mode 100644
index 311f385..0000000
--- a/templates/Debian-8.0-amd64-netboot/definition.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#Thanks to Fletcher Nichol - https://github.com/fnichol
-
-Veewee::Definition.declare({
-  :cpu_count => '1',
-  :memory_size=> '256',
-  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
-  :os_type_id => 'Debian_64',
-  :iso_file => "debian-8.0.0-amd64-netinst.iso",
-  :iso_src => "http://cdimage.debian.org/debian-cd/8.0.0/amd64/iso-cd/debian-8.0.0-amd64-netinst.iso"
-  :iso_md5 => "d9209f355449fe13db3963571b1f52d4",
-  :iso_download_timeout => "1000",
-  :boot_wait => "10", :boot_cmd_sequence => [
-     '<Esc>',
-     'install ',
-     'preseed/url=http://%IP%:%PORT%/preseed.cfg ',
-     'debian-installer=en_US ',
-     'auto ',
-     'locale=en_US ',
-     'kbd-chooser/method=us ',
-     'netcfg/get_hostname=%NAME% ',
-     'netcfg/get_domain=vagrantup.com ',
-     'fb=false ',
-     'debconf/frontend=noninteractive ',
-     'console-setup/ask_detect=false ',
-     'console-keymaps-at/keymap=us ',
-     'keyboard-configuration/xkb-keymap=us ',
-     '<Enter>'
-  ],
-  :kickstart_port => "7122",
-  :kickstart_timeout => "300",
-  :kickstart_file => "preseed.cfg",
-  :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 bash '%f'",
-  :shutdown_cmd => "halt -p",
-  :postinstall_files => [
-    "base.sh",
-    "vagrant.sh",
-    "virtualbox.sh",
-    #"vmfusion.sh",
-    "ruby.sh",
-    "puppet.sh",
-    "chef.sh",
-    "cleanup.sh",
-    "zerodisk.sh"
-  ],
-  :postinstall_timeout => "10000"
-})
diff --git a/templates/Debian-8.0-amd64-netboot/preseed.cfg b/templates/Debian-8.0-amd64-netboot/preseed.cfg
deleted file mode 100644
index a0613c7..0000000
--- a/templates/Debian-8.0-amd64-netboot/preseed.cfg
+++ /dev/null
@@ -1,313 +0,0 @@
-#### Contents of the preconfiguration file (for jessie)
-### Localization
-# Locale sets language and country.
-d-i debian-installer/locale string en_US.UTF-8
-
-# Keyboard selection.
-#d-i keymap select us
-d-i keyboard-configuration/xkb-keymap select us
-
-### Network configuration
-# netcfg will choose an interface that has link if possible. This makes it
-# skip displaying a list if there is more than one interface.
-d-i netcfg/choose_interface select auto
-
-# To pick a particular interface instead:
-#d-i netcfg/choose_interface select eth1
-
-# If you have a slow dhcp server and the installer times out waiting for
-# it, this might be useful.
-#d-i netcfg/dhcp_timeout string 60
-
-# If you prefer to configure the network manually, uncomment this line and
-# the static network configuration below.
-#d-i netcfg/disable_dhcp boolean true
-
-# If you want the preconfiguration file to work on systems both with and
-# without a dhcp server, uncomment these lines and the static network
-# configuration below.
-#d-i netcfg/dhcp_failed note
-#d-i netcfg/dhcp_options select Configure network manually
-
-# Static network configuration.
-#d-i netcfg/get_nameservers string 192.168.1.1
-#d-i netcfg/get_ipaddress string 192.168.1.42
-#d-i netcfg/get_netmask string 255.255.255.0
-#d-i netcfg/get_gateway string 192.168.1.1
-#d-i netcfg/confirm_static boolean true
-
-# Any hostname and domain names assigned from dhcp take precedence over
-# values set here. However, setting the values still prevents the questions
-# from being shown, even if values come from dhcp.
-#d-i netcfg/get_hostname string vagrant
-d-i netcfg/get_domain string vagrantup.com
-
-# Disable that annoying WEP key dialog.
-d-i netcfg/wireless_wep string
-# The wacky dhcp hostname that some ISPs use as a password of sorts.
-#d-i netcfg/dhcp_hostname string radish
-
-# If non-free firmware is needed for the network or other hardware, you can
-# configure the installer to always try to load it, without prompting. Or
-# change to false to disable asking.
-#d-i hw-detect/load_firmware boolean true
-
-### Network console
-# Use the following settings if you wish to make use of the network-console
-# component for remote installation over SSH. This only makes sense if you
-# intend to perform the remainder of the installation manually.
-#d-i anna/choose_modules string network-console
-#d-i network-console/password password r00tme
-#d-i network-console/password-again password r00tme
-
-### Mirror settings
-# If you select ftp, the mirror/country string does not need to be set.
-#d-i mirror/protocol string ftp
-d-i mirror/country string manual
-d-i mirror/http/hostname string http.debian.net
-d-i mirror/http/directory string /debian
-d-i mirror/http/proxy string
-
-# Suite to install.
-#d-i mirror/suite string testing
-# Suite to use for loading installer components (optional).
-#d-i mirror/udeb/suite string testing
-
-### Clock and time zone setup
-# Controls whether or not the hardware clock is set to UTC.
-d-i clock-setup/utc boolean true
-
-# You may set this to any valid setting for $TZ; see the contents of
-# /usr/share/zoneinfo/ for valid values.
-d-i time/zone string UTC
-
-# Controls whether to use NTP to set the clock during the install
-d-i clock-setup/ntp boolean true
-# NTP server to use. The default is almost always fine here.
-#d-i clock-setup/ntp-server string ntp.example.com
-
-### Partitioning
-# If the system has free space you can choose to only partition that space.
-#d-i partman-auto/init_automatically_partition select biggest_free
-
-# Alternatively, you can specify a disk to partition. The device name must
-# be given in traditional non-devfs format.
-# Note: A disk must be specified, unless the system has only one disk.
-# For example, to use the first SCSI/SATA hard disk:
-#d-i partman-auto/disk string /dev/sda
-# In addition, you'll need to specify the method to use.
-# The presently available methods are: "regular", "lvm" and "crypto"
-d-i partman-auto/method string lvm
-
-# If one of the disks that are going to be automatically partitioned
-# contains an old LVM configuration, the user will normally receive a
-# warning. This can be preseeded away...
-d-i partman-lvm/device_remove_lvm boolean true
-# The same applies to pre-existing software RAID array:
-d-i partman-md/device_remove_md boolean true
-
-# And the same goes for the confirmation to write the lvm partitions.
-d-i partman-lvm/confirm boolean true
-d-i partman-lvm/confirm_nooverwrite boolean true
-
-
-d-i partman/choose_partition select finish
-d-i partman-auto-lvm/guided_size string max
-
-# You can choose one of the three predefined partitioning recipes:
-# - atomic: all files in one partition
-# - home:   separate /home partition
-# - multi:  separate /home, /usr, /var, and /tmp partitions
-d-i partman-auto/choose_recipe select atomic
-d-i partman/default_filesystem string ext3
-
-# Or provide a recipe of your own...
-# The recipe format is documented in the file devel/partman-auto-recipe.txt.
-# If you have a way to get a recipe file into the d-i environment, you can
-# just point at it.
-#d-i partman-auto/expert_recipe_file string /hd-media/recipe
-
-# If not, you can put an entire recipe into the preconfiguration file in one
-# (logical) line. This example creates a small /boot partition, suitable
-# swap, and uses the rest of the space for the root partition:
-#d-i partman-auto/expert_recipe string                         \
-#      boot-root ::                                            \
-#              40 50 100 ext3                                  \
-#                      $primary{ } $bootable{ }                \
-#                      method{ format } format{ }              \
-#                      use_filesystem{ } filesystem{ ext3 }    \
-#                      mountpoint{ /boot }                     \
-#              .                                               \
-#              500 10000 1000000000 ext3                       \
-#                      method{ format } format{ }              \
-#                      use_filesystem{ } filesystem{ ext3 }    \
-#                      mountpoint{ / }                         \
-#              .                                               \
-#              64 512 300% linux-swap                          \
-#                      method{ swap } format{ }                \
-#              .
-
-#The preseed line that "selects finish" needs to be in a certain order in your preseed, the example-preseed does not follow this.
-#http://ubuntuforums.org/archive/index.php/t-1504045.html
-
-# This makes partman automatically partition without confirmation, provided
-# that you told it what to do using one of the methods above.
-d-i partman/confirm_write_new_label boolean true
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
-
-
-### Base system installation
-# Select the initramfs generator used to generate the initrd for 2.6 kernels.
-#d-i base-installer/kernel/linux/initramfs-generators string yaird
-
-# The kernel image (meta) package to be installed; "none" can be used if no
-# kernel is to be installed.
-#d-i base-installer/kernel/image string linux-image-2.6-486
-
-### Account setup
-# Skip creation of a root account (normal user account will be able to
-# use sudo).
-d-i passwd/root-login boolean false
-# Alternatively, to skip creation of a normal user account.
-#d-i passwd/make-user boolean false
-
-# Root password, either in clear text
-d-i passwd/root-password password vagrant
-d-i passwd/root-password-again password vagrant
-# or encrypted using an MD5 hash.
-#d-i passwd/root-password-crypted password [MD5 hash]
-
-# To create a normal user account.
-d-i passwd/user-fullname string Vagrant User
-d-i passwd/username string vagrant
-# Normal user's password, either in clear text
-d-i passwd/user-password password vagrant
-d-i passwd/user-password-again password vagrant
-# or encrypted using an MD5 hash.
-#d-i passwd/user-password-crypted password [MD5 hash]
-# Create the first user with the specified UID instead of the default.
-#d-i passwd/user-uid string 1010
-d-i user-setup/encrypt-home boolean false
-d-i user-setup/allow-password-weak boolean true
-
-# The user account will be added to some standard initial groups. To
-# override that, use this.
-d-i passwd/user-default-groups string audio cdrom video admin
-
-### Apt setup
-# You can choose to install non-free and contrib software.
-#d-i apt-setup/non-free boolean true
-#d-i apt-setup/contrib boolean true
-# Uncomment this if you don't want to use a network mirror.
-#d-i apt-setup/use_mirror boolean false
-# Select which update services to use; define the mirrors to be used.
-# Values shown below are the normal defaults.
-#d-i apt-setup/services-select multiselect security, volatile
-#d-i apt-setup/security_host string security.debian.org
-#d-i apt-setup/volatile_host string volatile.debian.org
-
-
-# By default the installer requires that repositories be authenticated
-# using a known gpg key. This setting can be used to disable that
-# authentication. Warning: Insecure, not recommended.
-#d-i debian-installer/allow_unauthenticated string true
-
-### Package selection
-tasksel tasksel/first multiselect standard
-# If the desktop task is selected, install the kde and xfce desktops
-# instead of the default gnome desktop.
-#tasksel tasksel/desktop multiselect kde, xfce
-
-# Individual additional packages to install
-d-i pkgsel/include string openssh-server ntp acpid  sudo bzip2 rsync
-
-# Whether to upgrade packages after debootstrap.
-# Allowed values: none, safe-upgrade, full-upgrade
-d-i pkgsel/upgrade select none
-
-# Some versions of the installer can report back on what software you have
-# installed, and what software you use. The default is not to report back,
-# but sending reports helps the project determine what software is most
-# popular and include it on CDs.
-popularity-contest popularity-contest/participate boolean false
-
-### Boot loader installation
-# Grub is the default boot loader (for x86). If you want lilo installed
-# instead, uncomment this:
-#d-i grub-installer/skip boolean true
-# To also skip installing lilo, and install no bootloader, uncomment this
-# too:
-#d-i lilo-installer/skip boolean true
-
-# This is fairly safe to set, it makes grub install automatically to the MBR
-# if no other operating system is detected on the machine.
-d-i grub-installer/only_debian boolean true
-
-# This one makes grub-installer install to the MBR if it also finds some other
-# OS, which is less safe as it might not be able to boot that other OS.
-d-i grub-installer/with_other_os boolean true
-
-# Alternatively, if you want to install to a location other than the mbr,
-# uncomment and edit these lines:
-#d-i grub-installer/only_debian boolean false
-#d-i grub-installer/with_other_os boolean false
-#d-i grub-installer/bootdev  string (hd0,0)
-# To install grub to multiple disks:
-#d-i grub-installer/bootdev  string (hd0,0) (hd1,0) (hd2,0)
-
-# Optional password for grub, either in clear text
-#d-i grub-installer/password password r00tme
-#d-i grub-installer/password-again password r00tme
-# or encrypted using an MD5 hash, see grub-md5-crypt(8).
-#d-i grub-installer/password-crypted password [MD5 hash]
-
-### Finishing up the installation
-# During installations from serial console, the regular virtual consoles
-# (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next
-# line to prevent this.
-#d-i finish-install/keep-consoles boolean true
-
-# Avoid that last message about the install being complete.
-d-i finish-install/reboot_in_progress note
-
-# This will prevent the installer from ejecting the CD during the reboot,
-# which is useful in some situations.
-#d-i cdrom-detect/eject boolean false
-
-# This is how to make the installer shutdown when finished, but not
-# reboot into the installed system.
-#d-i debian-installer/exit/halt boolean true
-# This will power off the machine instead of just halting it.
-#d-i debian-installer/exit/poweroff boolean true
-
-### Preseeding other packages
-# Depending on what software you choose to install, or if things go wrong
-# during the installation process, it's possible that other questions may
-# be asked. You can preseed those too, of course. To get a list of every
-# possible question that could be asked during an install, do an
-# installation, and then run these commands:
-#   debconf-get-selections --installer > file
-#   debconf-get-selections >> file
-
-
-#### Advanced options
-### Running custom commands during the installation
-# d-i preseeding is inherently not secure. Nothing in the installer checks
-# for attempts at buffer overflows or other exploits of the values of a
-# preconfiguration file like this one. Only use preconfiguration files from
-# trusted locations! To drive that home, and because it's generally useful,
-# here's a way to run any shell command you'd like inside the installer,
-# automatically.
-
-# This first command is run as early as possible, just after
-# preseeding is read.
-# Prevent packaged version of VirtualBox Guest Additions being installed:
-d-i preseed/early_command string sed -i \
-  '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \
-  /usr/lib/pre-pkgsel.d/20install-hwpackages
-
-# This command is run just before the install finishes, but when there is
-# still a usable /target directory. You can chroot to /target and use it
-# directly, or use the apt-install and in-target commands to easily install
-# packages and run commands in the target system.
diff --git a/templates/Debian-8.0-amd64-netboot/puppet.sh b/templates/Debian-8.0-amd64-netboot/puppet.sh
deleted file mode 100644
index e5bb781..0000000
--- a/templates/Debian-8.0-amd64-netboot/puppet.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# Prepare puppetlabs repo
-wget http://apt.puppetlabs.com/puppetlabs-release-jessie.deb
-dpkg -i puppetlabs-release-jessie.deb
-apt-get update
-
-# Install puppet/facter
-apt-get install -y puppet facter
diff --git a/templates/Debian-8.0-amd64-netboot/ruby.sh b/templates/Debian-8.0-amd64-netboot/ruby.sh
deleted file mode 100644
index e44d60d..0000000
--- a/templates/Debian-8.0-amd64-netboot/ruby.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-# Install Ruby from packages
-apt-get -y install ruby ruby-dev libopenssl-ruby1.8 irb ri rdoc
-
-# Install Rubygems from source
-rg_ver=1.8.22
-curl -o /tmp/rubygems-${rg_ver}.zip \
-  "http://production.cf.rubygems.org/rubygems/rubygems-${rg_ver}.zip"
-(cd /tmp && unzip rubygems-${rg_ver}.zip && \
-  cd rubygems-${rg_ver} && ruby setup.rb --no-format-executable)
-rm -rf /tmp/rubygems-${rg_ver} /tmp/rubygems-${rg_ver}.zip
diff --git a/templates/Debian-8.0-amd64-netboot/vagrant.sh b/templates/Debian-8.0-amd64-netboot/vagrant.sh
deleted file mode 100644
index 54c2a71..0000000
--- a/templates/Debian-8.0-amd64-netboot/vagrant.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# Set up Vagrant.
-
-date > /etc/vagrant_box_build_time
-
-# Create the user vagrant with password vagrant
-useradd -G sudo -p $(perl -e'print crypt("vagrant", "vagrant")') -m -s /bin/bash -N vagrant
-
-# Install vagrant keys
-mkdir -pm 700 /home/vagrant/.ssh
-curl -Lo /home/vagrant/.ssh/authorized_keys \
-  'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub'
-chmod 0600 /home/vagrant/.ssh/authorized_keys
-chown -R vagrant:vagrant /home/vagrant/.ssh
-
-# Customize the message of the day
-echo 'Welcome to your Vagrant-built virtual machine.' > /var/run/motd
-
-# Install NFS client
-apt-get -y install nfs-common
-
-
diff --git a/templates/Debian-8.0-amd64-netboot/virtualbox.sh b/templates/Debian-8.0-amd64-netboot/virtualbox.sh
deleted file mode 100644
index 4dad649..0000000
--- a/templates/Debian-8.0-amd64-netboot/virtualbox.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-if test -f .vbox_version ; then
-  # The netboot installs the VirtualBox support (old) so we have to remove it
-  if test -f /etc/init.d/virtualbox-ose-guest-utils ; then
-    /etc/init.d/virtualbox-ose-guest-utils stop
-  fi
-
-  rmmod vboxguest
-  aptitude -y purge virtualbox-ose-guest-x11 virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
-
-  # Install dkms for dynamic compiles
-
-  apt-get install -y dkms
-
-  # If libdbus is not installed, virtualbox will not autostart
-  apt-get -y install --no-install-recommends libdbus-1-3
-
-  # Install the VirtualBox guest additions
-  VBOX_VERSION=$(cat .vbox_version)
-  VBOX_ISO=VBoxGuestAdditions_$VBOX_VERSION.iso
-  mount -o loop $VBOX_ISO /mnt
-  yes|sh /mnt/VBoxLinuxAdditions.run
-  umount /mnt
-
-  # Start the newly build driver
-  /etc/init.d/vboxadd start
-
-  # Make a temporary mount point
-  mkdir /tmp/veewee-validation
-
-  # Test mount the veewee-validation
-  mount -t vboxsf veewee-validation /tmp/veewee-validation
-
-  rm $VBOX_ISO
-
-  # Symlink vbox guest additions. Fix for https://github.com/mitchellh/vagrant/issues/3341
-  ln -s /opt/VBoxGuestAdditions-$VBOX_VERSION/lib/VBoxGuestAdditions /usr/lib/VBoxGuestAdditions
-fi
diff --git a/templates/Debian-8.0-amd64-netboot/vmfusion.sh b/templates/Debian-8.0-amd64-netboot/vmfusion.sh
deleted file mode 100644
index 3ced7e4..0000000
--- a/templates/Debian-8.0-amd64-netboot/vmfusion.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-cd /tmp
-mkdir -p /mnt/cdrom
-mount -o loop /home/vagrant/linux.iso /mnt/cdrom
-tar zxvf /mnt/cdrom/VMwareTools-*.tar.gz -C /tmp/
-/tmp/vmware-tools-distrib/vmware-install.pl -d
-rm /home/vagrant/linux.iso
-umount /mnt/cdrom
diff --git a/templates/Debian-8.0-amd64-netboot/zerodisk.sh b/templates/Debian-8.0-amd64-netboot/zerodisk.sh
deleted file mode 100644
index 938075a..0000000
--- a/templates/Debian-8.0-amd64-netboot/zerodisk.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Zero out the free space to save space in the final image:
-dd if=/dev/zero of=/EMPTY bs=1M
-rm -f /EMPTY