veewee 0.3.12 → 0.4.0

data/templates/freebsd-9.2-RELEASE-amd64/definition.rb

@@ -0,0 +1,28 @@
+Veewee::Definition.declare({
+  :cpu_count => '1', :memory_size=> '512',
+  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
+  :os_type_id => 'FreeBSD_64',
+  :iso_file => "FreeBSD-9.2-RELEASE-amd64-disc1.iso",
+  :iso_src => "ftp://ftp.freebsd.org/pub/FreeBSD/releases/amd64/ISO-IMAGES/9.2/FreeBSD-9.2-RELEASE-amd64-disc1.iso",
+  :iso_md5 => "cde180e3c5e3e370c97598a4feccb5b4",
+  :iso_download_timeout => "1000",
+  :boot_wait => "10", :boot_cmd_sequence => [
+    '<Esc>',
+    'boot -s',
+    '<Enter>',
+    '<Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait><Wait>',
+    '/bin/sh<Enter>',
+    'mdmfs -s 100m md1 /tmp<Enter>',
+    'dhclient -l /tmp/dhclient.lease.em0 em0<Enter>',
+    '<Wait><Wait><Wait>',
+    'echo "Sleeping for 10 seconds, then running install script."<Enter>',
+    'sleep 10 ; fetch -o /tmp/install.sh http://%IP%:%PORT%/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh %NAME%<Enter>'
+  ],
+  :kickstart_port => "7122", :kickstart_timeout => "10000", :kickstart_file => "install.sh",
+  :ssh_login_timeout => "10000", :ssh_user => "root", :ssh_password => "vagrant", :ssh_key => "",
+  :ssh_host_port => "7222", :ssh_guest_port => "22",
+  :sudo_cmd => "sh '%f'",
+  :shutdown_cmd => "shutdown -p now",
+  :postinstall_files => [ "postinstall.csh"], :postinstall_timeout => "10000"
+})
+#'setkmap=us dodhcp=em0 dhcphostname=%NAME% ar_source=http://%IP%:%PORT%/ autoruns=0 rootpass=vagrant',

data/templates/freebsd-9.2-RELEASE-amd64/install.sh

@@ -0,0 +1,66 @@
+#!/bin/sh -x
+
+# Credit: http://www.aisecure.net/2011/05/01/root-on-zfs-freebsd-current/
+
+NAME=$1
+
+# create disks
+gpart create -s gpt ada0
+gpart add -t freebsd-boot -l boot -b 40 -s 512K ada0
+gpart bootcode -b /boot/pmbr -p /boot/gptboot -i 1 ada0
+gpart add -t freebsd-ufs -l root -b 1M -s 2G ada0
+gpart add -t freebsd-swap -l swap -s 512M ada0
+gpart add -t freebsd-ufs -l var -s 1G ada0
+gpart add -t freebsd-ufs -l tmp -s 512M ada0
+gpart add -t freebsd-ufs -l usr -a 1M ada0
+
+# create filesystems
+newfs -U /dev/gpt/root
+newfs -U /dev/gpt/var
+newfs -U /dev/gpt/tmp
+newfs -U /dev/gpt/usr
+
+# mount the filesystems
+mount /dev/gpt/root /mnt
+mkdir /mnt/var && mount /dev/gpt/var /mnt/var
+mkdir /mnt/tmp && mount /dev/gpt/tmp /mnt/tmp
+mkdir /mnt/usr && mount /dev/gpt/usr /mnt/usr
+
+# correct permissions
+chmod 1777 /mnt/tmp
+mkdir /mnt/var/tmp && chmod 1777 /mnt/var/tmp
+cd /mnt && mkdir usr/home && ln -s usr/home home
+
+# Install the OS
+cd /usr/freebsd-dist
+cat base.txz | tar --unlink -xpJf - -C /mnt
+cat lib32.txz | tar --unlink -xpJf - -C /mnt
+cat kernel.txz | tar --unlink -xpJf - -C /mnt
+cat src.txz | tar --unlink -xpJf - -C /mnt
+
+# Enable required services
+cat >> /mnt/etc/rc.conf << EOT
+hostname="${NAME}"
+ifconfig_em0="dhcp"
+sshd_enable="YES"
+EOT
+
+# Enable swap
+cat >> /mnt/etc/fstab << EOT
+/dev/gpt/swap none swap sw 0 0
+/dev/gpt/root /    ufs  rw 1 1
+/dev/gpt/var  /var ufs  rw 1 1
+/dev/gpt/tmp  /tmp ufs  rw 1 1
+/dev/gpt/usr  /usr ufs  rw 1 1
+EOT
+
+# Install a few requirements
+touch /mnt/etc/resolv.conf
+echo 'PermitRootLogin yes' >> /mnt/etc/ssh/sshd_config
+
+# Set up user accounts
+mkdir /mnt/usr/home/vagrant && chown 1001:1001 /mnt/home/vagrant
+echo "vagrant" | pw -V /mnt/etc useradd vagrant -h 0 -s csh -G wheel -d /home/vagrant -c "Vagrant User"
+echo "vagrant" | pw -V /mnt/etc usermod root -h 0
+
+reboot

data/templates/freebsd-9.2-RELEASE-amd64/postinstall.csh

@@ -0,0 +1,134 @@
+#!/bin/csh -x
+set echo
+
+#Set the time correctly
+ntpdate -v -b in.pool.ntp.org
+
+date > /etc/vagrant_box_build_time
+
+# allow freebsd-update to run fetch without stdin attached to a terminal
+sed 's/\[ ! -t 0 \]/false/' /usr/sbin/freebsd-update > /tmp/freebsd-update
+chmod +x /tmp/freebsd-update
+
+# update FreeBSD
+env PAGER=/bin/cat /tmp/freebsd-update fetch
+env PAGER=/bin/cat /tmp/freebsd-update install
+
+# allow portsnap to run fetch without stdin attached to a terminal
+sed 's/\[ ! -t 0 \]/false/' /usr/sbin/portsnap > /tmp/portsnap
+chmod +x /tmp/portsnap
+
+# reduce the ports we extract to a minimum
+cat >> /etc/portsnap.conf << EOT
+REFUSE accessibility arabic archivers astro audio benchmarks biology cad
+REFUSE chinese comms databases deskutils distfiles dns editors finance french
+REFUSE ftp games german graphics hebrew hungarian irc japanese java korean
+REFUSE mail math multimedia net net-im net-mgmt net-p2p news packages palm
+REFUSE polish portuguese print russian science sysutils ukrainian
+REFUSE vietnamese www x11 x11-clocks x11-drivers x11-fm x11-fonts x11-servers
+REFUSE x11-themes x11-toolkits x11-wm
+EOT
+
+# get new ports
+/tmp/portsnap fetch extract
+
+# install sudo and bash
+pkg_delete -af
+cd /usr/ports/security/sudo
+make -DBATCH install clean
+cd /usr/ports/shells/bash-static
+make -DBATCH install clean
+
+#Off to rubygems to get first ruby running
+cd /usr/ports/devel/ruby-gems
+make install -DBATCH
+
+#Need ruby iconv in order for chef to run
+cd /usr/ports/converters/ruby-iconv
+make install -DBATCH
+
+#Installing chef & Puppet
+/usr/local/bin/gem install chef --no-ri --no-rdoc
+/usr/local/bin/gem install puppet --no-ri --no-rdoc
+
+#Installing vagrant keys
+mkdir /home/vagrant/.ssh
+chmod 700 /home/vagrant/.ssh
+cd /home/vagrant/.ssh
+fetch -am -o authorized_keys 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub'
+chown -R vagrant /home/vagrant/.ssh
+chmod -R go-rwsx /home/vagrant/.ssh
+
+# Cleaning portstree to save space
+# http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/ports-using.html
+cd /usr/ports/ports-mgmt/portupgrade
+make install -DBATCH clean
+
+/usr/local/sbin/portsclean -C
+
+# As sharedfolders are not in defaults ports tree
+# We will use vagrant via NFS
+# Enable NFS
+echo 'rpcbind_enable="YES"' >> /etc/rc.conf
+echo 'nfs_server_enable="YES"' >> /etc/rc.conf
+echo 'mountd_flags="-r"' >> /etc/rc.conf
+
+# Enable passwordless sudo
+echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /usr/local/etc/sudoers
+# Restore correct su permissions
+# I'll leave that up to the reader :)
+
+cd /usr/ports/devel/libtool
+make clean
+make install -DBATCH
+
+# disable X11 because vagrants are (usually) headless
+cat >> /etc/make.conf << EOT
+WITHOUT_X11="YES"
+EOT
+
+cd /usr/ports/emulators/virtualbox-ose-additions
+make -DBATCH install clean
+
+cd /usr/ports/emulators/virtio-kmod
+make -DBATCH install
+
+# undo our customizations
+sed -i '' -e '/^REFUSE /d' /etc/portsnap.conf
+sed -i '' -e '/^PermitRootLogin /d' /etc/ssh/sshd_config
+/usr/sbin/service sshd reload
+
+echo 'vboxdrv_load="YES"' >> /boot/loader.conf
+echo 'vboxnet_enable="YES"' >> /etc/rc.conf
+echo 'vboxguest_enable="YES"' >> /etc/rc.conf
+echo 'vboxservice_enable="YES"' >> /etc/rc.conf
+
+cat >> /boot/loader.conf << EOT
+virtio_load="YES"
+virtio_pci_load="YES"
+virtio_blk_load="YES"
+if_vtnet_load="YES"
+virtio_balloon_load="YES"
+EOT
+
+echo 'ifconfig_vtnet0_name="em0"' >> /etc/rc.conf
+echo 'ifconfig_vtnet1_name="em1"' >> /etc/rc.conf
+echo 'ifconfig_vtnet2_name="em2"' >> /etc/rc.conf
+echo 'ifconfig_vtnet3_name="em3"' >> /etc/rc.conf
+
+pw groupadd vboxusers
+pw groupmod vboxusers -m vagrant
+
+#Bash needs to be the shell for tests to validate
+pw usermod vagrant -s /usr/local/bin/bash
+
+echo "=============================================================================="
+echo "NOTE: FreeBSD - Vagrant"
+echo "When using this basebox you need to do some special stuff in your Vagrantfile"
+echo "1) Enable HostOnly network"
+echo "   config.vm.network ...."
+echo "2) Use nfs instead of shared folders"
+echo '   config.vm.share_folder("v-root", "/vagrant", ".", :nfs => true)'
+echo "============================================================================="
+
+exit

data/templates/{funtoo-latest-x86_64 → funtoo-stable-x86_64}/definition.rb

@@ -1,4 +1,6 @@
 password = 'vagrant'
+builddate = '20131226'
+iso = "install-amd64-minimal-#{builddate}.iso"
 
 Veewee::Session.declare({
   :hostiocache => 'off',
@@ -7,9 +9,9 @@ Veewee::Session.declare({
   :disk_size => '40560', # 40 GB
   :disk_format => 'VDI',
   :os_type_id => 'Gentoo_64', # for 32bit, change to 'Gentoo'
-  :iso_file => "install-amd64-minimal-20130110.iso",
-  :iso_src => "http://mirror.switch.ch/ftp/mirror/gentoo/releases/amd64/autobuilds/20130110/install-amd64-minimal-20130110.iso",
-  :iso_md5 => "67cfb094d159d7b359ea9797d636b6c7",
+  :iso_file => iso,
+  :iso_src => "http://mirror.switch.ch/ftp/mirror/gentoo/releases/amd64/autobuilds/#{builddate}/#{iso}",
+  :iso_sha512 => "4a19a59c5fa5f2d3a8fd31cde2379abafcb0e3c720884471e1dc0b2557fda3328198dea728d8c6f792a0ccf3e56f1e4dfadbdcb41e38bb675b8de0bea36ab0a9",
   :iso_download_timeout => "1000",
   :boot_wait => "4",
   :boot_cmd_sequence => [

data/templates/{funtoo-latest-x86_64 → funtoo-stable-x86_64}/postinstall.sh

@@ -8,19 +8,18 @@ password_root=vagrant
 password_vagrant=vagrant
 
 # static versions of programs we install
-ruby_version="1.9.3-p286"
-# ...these are for rbenv and its plugins ruby-builder and rbenv-bundler
-rbenv_version="v0.3.0"
-ruby_builder_version="v20121022"
-rbenv_bundler_version="0.94"
+ruby_version="ruby:2.0" #"1.9.3-p286"
+ruby_pretty="$(echo $ruby_version | tr -d [:.])"
 
 # these two (configuring the compiler) and the stage3 url can be changed to build a 32 bit system
 accept_keywords="amd64"
 chost="x86_64-pc-linux-gnu"
 
 # stage 3 filename and full url
+# http://ftp.osuosl.org/pub/funtoo/
+# http://ftp.heanet.ie/mirrors/funtoo/
 stage3file="stage3-latest.tar.xz"
-stage3url="http://ftp.heanet.ie/mirrors/funtoo/funtoo-current/x86-64bit/generic_64/$stage3file"
+stage3url="http://ftp.osuosl.org/pub/funtoo/funtoo-stable/x86-64bit/generic_64/$stage3file"
 
 # the public key for vagrants ssh
 vagrant_ssh_key_url="https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub"
@@ -41,7 +40,7 @@ sgdisk -n 1:0:+128M -t 1:8300 -c 1:"linux-boot" \
        -n 4:0:0     -t 4:8300 -c 4:"linux-root" \
        -p /dev/sda
 
-sleep 1
+#sleep 1
 
 # format partitions, mount swap
 mkswap /dev/sda3
@@ -54,10 +53,10 @@ sgdisk -v /dev/sda
 sgdisk -p /dev/sda
 
 # this is our chroot directory for the installation
-chroot=/mnt/gentoo
+chroot_dir=/mnt/gentoo
 
 # mount other partitions
-mount /dev/sda4 "$chroot" && cd "$chroot" && mkdir boot && mount /dev/sda1 boot
+mount /dev/sda4 "${chroot_dir}" && cd "${chroot_dir}" && mkdir boot && mount /dev/sda1 boot
 
 
 ### BASE-INSTALLATION ###
@@ -67,25 +66,25 @@ wget -nv --tries=5 "$stage3url"
 tar xpf "$stage3file" && rm "$stage3file"
 
 # prepeare chroot, update env
-mount --bind /proc "$chroot/proc"
-mount --bind /dev "$chroot/dev"
+mount --bind /proc "${chroot_dir}/proc"
+mount --bind /dev "${chroot_dir}/dev"
 
 
 ### INITIAL CONFIGURATION ###
 
-# copy nameserver information, save build timestamp 
-cp /etc/resolv.conf "$chroot/etc/"
-date -u > "$chroot/etc/vagrant_box_build_time"
-chroot "$chroot" env-update
+# copy nameserver information, save build timestamp
+cp /etc/resolv.conf "${chroot_dir}/etc/"
+date -u > "${chroot_dir}/etc/vagrant_box_build_time"
+#chroot "${chroot_dir}" env-update
 
 #" activate client side dhcp and ssh by default
-chroot "$chroot" /bin/bash <<DATAEOF
+chroot "${chroot_dir}" /bin/bash <<DATAEOF
 rc-update add dhcpcd default
 rc-update add sshd default
 DATAEOF
 
 # set fstab
-cat <<DATAEOF > "$chroot/etc/fstab"
+cat <<DATAEOF > "${chroot_dir}/etc/fstab"
 # <fs>                  <mountpoint>    <type>          <opts>                   <dump/pass>
 /dev/sda1               /boot           ext2            noauto,noatime           1 2
 /dev/sda3               none            swap            sw                       0 0
@@ -94,7 +93,7 @@ none                    /dev/shm        tmpfs           nodev,nosuid,noexec
 DATAEOF
 
 # set make options
-cat <<DATAEOF > "$chroot/etc/portage/make.conf"
+cat <<DATAEOF > "${chroot_dir}/etc/portage/make.conf"
 CHOST="$chost"
 
 CFLAGS="-mtune=generic -O2 -pipe"
@@ -104,34 +103,49 @@ ACCEPT_KEYWORDS="$accept_keywords"
 MAKEOPTS="-j$((1 + $nr_cpus)) -l$nr_cpus.5"
 EMERGE_DEFAULT_OPTS="-j$nr_cpus --quiet-build=y"
 FEATURES="\${FEATURES} parallel-fetch"
-
+GENTOO_MIRRORS="http://distfiles ${GENTOO_MIRRORS}"
+# no reason to keep these hanging around
+DISTDIR="/tmp/distfiles"
 # english only
 LINGUAS=""
 
+# get us some ruby
+RUBY_TARGETS="${ruby_pretty}"
+USE="ruby"
+
 # for X support if needed
 INPUT_DEVICES="evdev"
 VIDEO_CARDS="virtualbox"
 DATAEOF
 
 # add package use flags
-cat <<DATAEOF >> "$chroot/etc/portage/package.use"
+cat <<DATAEOF >> "${chroot_dir}/etc/portage/package.use"
 sys-kernel/gentoo-sources symlink
 sys-kernel/genkernel -cryptsetup
 DATAEOF
 
 # add package keywords
-cat <<DATAEOF >> "$chroot/etc/portage/package.keywords"
+cat <<DATAEOF >> "${chroot_dir}/etc/portage/package.keywords"
 app-emulation/virtualbox-guest-additions
 DATAEOF
 
-# update portage tree to most current state
-chroot "$chroot" emerge --sync
+# add package keywords
+cat <<DATAEOF >> "${chroot_dir}/etc/portage/package.accept_keywords"
+dev-util/kbuild ~amd64
+DATAEOF
+
+# update portage tree to most current state git://github.com/funtoo/ports-2012.git
+remote_git='git://github.com/funtoo/ports-2012.git' # 'git://home/ports-2012.git'
+echo "cloning  to /usr/portage"
+chroot "${chroot_dir}" git clone --depth 1 ${remote_git} /usr/portage
+chroot "${chroot_dir}" emerge --sync
+chroot "${chroot_dir}" env-update
 
 # set localtime
-chroot "$chroot" ln -sf "/usr/share/zoneinfo/$timezone" /etc/localtime
+chroot "${chroot_dir}" ln -sf "/usr/share/zoneinfo/$timezone" /etc/localtime
 
 # get, configure, compile and install the kernel and modules
-chroot "$chroot" /bin/bash <<DATAEOF
+chroot "${chroot_dir}" /bin/bash <<DATAEOF
 emerge sys-kernel/gentoo-sources sys-kernel/genkernel sys-boot/boot-update
 
 # specialize for VirtualBox - use loaded modules in livecd
@@ -233,32 +247,31 @@ DATAEOF
 
 # install the virtualbox guest additions, add vagrant and root to group vboxguest
 # PREREQUISITE: kernel - we install a module, so we use the kernel sources
-chroot "$chroot" /bin/bash <<DATAEOF
+chroot "${chroot_dir}" /bin/bash <<DATAEOF
 emerge app-emulation/virtualbox-guest-additions
-# we need this as gentoo doesn't do it on its own
-groupadd -r vboxsf
 mkdir /media && chgrp vboxsf /media
 rc-update add virtualbox-guest-additions default
 DATAEOF
 
-# add default users and groups, setpasswords, configure privileges and install sudo
-mkdir -p "$chroot/home/vagrant/.ssh"
-chmod 700 "$chroot/home/vagrant/.ssh"
-wget --no-check-certificate "$vagrant_ssh_key_url" -O "$chroot/home/vagrant/.ssh/authorized_keys"
-chmod 600 "$chroot/home/vagrant/.ssh/authorized_keys"
-cp -f /root/.vbox_version "$chroot/home/vagrant/.vbox_version"
-
 # for passwordless logins
-mkdir -p "$chroot/root/.ssh" 2> /dev/null
-cat /tmp/ssh-root.pub >> "$chroot/root/.ssh/authorized_keys"
+mkdir -p "${chroot_dir}/root/.ssh" 2> /dev/null
+cat /tmp/ssh-root.pub >> "${chroot_dir}/root/.ssh/authorized_keys"
 
 # PREREQUISITE: virtualbox-guest-additions - the groups created on installation have to exist
-chroot $chroot /bin/bash <<DATAEOF
+chroot ${chroot_dir} /bin/bash <<DATAEOF
 groupadd -r vagrant
-groupadd -r rbenv
-useradd -m -r vagrant -g vagrant -G wheel,rbenv,vboxsf,vboxguest -c 'added by vagrant, veewee basebox creation'
+useradd -m -r vagrant -g vagrant -G wheel,vboxsf,vboxguest -c 'added by vagrant, veewee basebox creation'
+DATAEOF
+
+# add default users and groups, setpasswords, configure privileges and install sudo
+mkdir -p "${chroot_dir}/home/vagrant/.ssh"
+chmod 700 "${chroot_dir}/home/vagrant/.ssh"
+wget --no-check-certificate "$vagrant_ssh_key_url" -O "${chroot_dir}/home/vagrant/.ssh/authorized_keys"
+chmod 600 "${chroot_dir}/home/vagrant/.ssh/authorized_keys"
+cp -f /root/.vbox_version "${chroot_dir}/home/vagrant/.vbox_version"
 
 # set passwords (for after reboot)
+chroot ${chroot_dir} /bin/bash <<DATAEOF
 passwd<<EOF
 $password_root
 $password_root
@@ -281,7 +294,7 @@ DATAEOF
 
 # configure ssh daemon
 # veewee validate uses password authentication (according to the other Funtoo-template), so we have to enable it
-cat <<DATAEOF > "$chroot/etc/ssh/sshd_config"
+cat <<DATAEOF > "${chroot_dir}/etc/ssh/sshd_config"
 HostBasedAuthentication no
 IgnoreUserKnownHosts yes
 PasswordAuthentication yes
@@ -297,46 +310,20 @@ UsePAM yes
 UsePrivilegeSeparation sandbox
 DATAEOF
 
-# install rbenv, ruby and bundler. Configure rbenv for global usage so it's usable without home directory
-chroot "$chroot" /bin/bash <<DATAEOF
-cd /usr/local/lib
-git clone git://github.com/sstephenson/rbenv.git
-cd rbenv
-git checkout -b "$rbenv_version" "$rbenv_version"
-mkdir -p env/plugins
-cd env/plugins
-git clone git://github.com/sstephenson/ruby-build.git
-cd ruby-build
-git checkout -b "$ruby_builder_version" "$ruby_builder_version"
-cd ..
-git clone git://github.com/carsomyr/rbenv-bundler.git
-cd rbenv-bundler
-git checkout -b "$rbenv_bundler_version" "$rbenv_bundler_version"
-chgrp -R rbenv /usr/local/lib/rbenv
-DATAEOF
-libtool --finish /usr/lib64
-
-# add rbenv to profile
-cat <<DATAEOF >> "$chroot/etc/profile.d/rbenv.sh"
-# add rbenv support
-rbenv_base=/usr/local/lib/rbenv
-export PATH=\$PATH:\$rbenv_base/bin
-[ -n \$RBENV_ROOT ] && export RBENV_ROOT=\$rbenv_base/env
-eval "\$(rbenv init -)"
-DATAEOF
-
 # install ruby, bundler, chef and puppet
-chroot "$chroot" /bin/bash <<DATAEOF
+echo "Install ruby, bundler, chef and puppet"
+chroot "${chroot_dir}" /bin/bash <<DATAEOF
 env-update && source /etc/profile
 
 # install ruby, use it as global version
 emerge dev-libs/libyaml
-rbenv install "$ruby_version"
-rbenv global "$ruby_version"
+emerge ${ruby_version}
+# set this as our default ruby.  remove : and .
+eselect ruby set ${ruby_pretty}
+
 
 # disable rdoc and ri
-mkdir -p "/usr/local/lib/rbenv/env/versions/$ruby_version/etc"
-cat <<EOF > "/usr/local/lib/rbenv/env/versions/$ruby_version/etc/gemrc"
+cat <<EOF > "/etc/gemrc"
 # disable rdoc and ri
 install: --no-rdoc --no-ri
 update:  --no-rdoc --no-ri
@@ -347,17 +334,17 @@ gem install bundler chef puppet
 DATAEOF
 
 # install logger and cron
-chroot "$chroot" /bin/bash <<DATAEOF
+chroot "${chroot_dir}" /bin/bash <<DATAEOF
 emerge app-admin/rsyslog sys-process/vixie-cron
 rc-update add rsyslog default
 rc-update add vixie-cron default
 DATAEOF
 
 # install nfs and automount support
-# chroot "$chroot" emerge net-fs/nfs-utils net-fs/autofs
+# chroot "${chroot_dir}" emerge net-fs/nfs-utils net-fs/autofs
 
 # make the disk bootable
-chroot "$chroot" /bin/bash <<DATAEOF
+chroot "${chroot_dir}" /bin/bash <<DATAEOF
 source /etc/profile && \
 env-update && \
 grub-install --no-floppy /dev/sda && \
@@ -370,7 +357,8 @@ cat grub.cfg
 DATAEOF
 
 ### patch to make lib/vagrant/guest/gentoo.rb happy
-chroot "$chroot" /bin/bash <<DATAEOF
+# not needed for much longer
+chroot "${chroot_dir}" /bin/bash <<DATAEOF
 cd /etc/init.d
 ln -s net.lo netif.lo
 DATAEOF
@@ -379,13 +367,17 @@ DATAEOF
 ### CLEANUP TO SHRINK THE BOX ###
 
 # a fresh install probably shouldn't nag about news
-chroot "$chroot" /usr/bin/eselect news read all
+chroot "${chroot_dir}" /usr/bin/eselect news read all > /dev/null 2>&1
 
 # cleanup time...
-chroot "$chroot" /bin/bash <<DATAEOF
+chroot "${chroot_dir}" /bin/bash <<DATAEOF
 # delete temp, cached and build artifact data - some low hanging fruit...
+
+#this is kinda big...  
+rm -r /usr/src/linux/drivers
+
 eclean -d distfiles
-rm /tmp/*
+rm -rf /tmp/*
 rm -rf /var/log/*
 rm -rf /var/tmp/*
 
@@ -396,22 +388,19 @@ rm -rf /var/tmp/*
 rm -rf /root/.gem
 
 # here's some savings crippling the usage of this box (sorted descending by damage)
-#rm -rf /usr/local/lib/rbenv/.git
-#rm -rf /usr/local/lib/rbenv/env/plugins/*/.git
 #rm -rf /usr/src/linux*
-#rm -rf /usr/portage/.git
 DATAEOF
 
 # fill all free hdd space with zeros
-dd if=/dev/zero of="$chroot/boot/EMPTY" bs=1M
-rm "$chroot/boot/EMPTY"
+dd if=/dev/zero of="${chroot_dir}/boot/EMPTY" bs=1M
+rm "${chroot_dir}/boot/EMPTY"
 
-dd if=/dev/zero of="$chroot/EMPTY" bs=1M
-rm "$chroot/EMPTY"
+dd if=/dev/zero of="${chroot_dir}/EMPTY" bs=1M
+rm "${chroot_dir}/EMPTY"
 
 # fill all swap space with zeros and recreate swap
 swapoff /dev/sda3
 shred -n 0 -z /dev/sda3
 mkswap /dev/sda3
 
-exit
+exit