veewee 0.1.25 → 0.1.26

data/.gitignore

@@ -3,6 +3,8 @@ gems/*
 iso/*
 tmp/*
 definitions/*
+Vagrantfile
+cookbooks/*
 boxes/*
 pkg/*
 *.box

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    veewee (0.1.25)
+    veewee (0.1.26)
       cucumber (= 0.8.5)
       highline (~> 1.6.1)
       net-ssh (~> 2.1.0)
@@ -27,11 +27,10 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
+    ffi (1.0.9)
     gherkin (2.1.5)
       trollop (~> 1.16.2)
-    highline (1.6.1)
+    highline (1.6.2)
     i18n (0.5.0)
     json (1.5.1)
     json_pure (1.4.6)
@@ -44,19 +43,18 @@ GEM
       Platform (>= 0.4.0)
       open4 (>= 0.4.0)
     progressbar (0.9.0)
-    rake (0.8.7)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
       rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
+    rspec-core (2.5.2)
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
     term-ansicolor (1.0.5)
     thor (0.14.6)
     trollop (1.16.2)
-    vagrant (0.7.3)
+    vagrant (0.7.5)
       archive-tar-minitar (= 0.5.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -66,8 +64,8 @@ GEM
       net-ssh (~> 2.1.0)
       thor (~> 0.14.6)
       virtualbox (~> 0.8.3)
-    virtualbox (0.8.3)
-      ffi (~> 0.6.3)
+    virtualbox (0.8.6)
+      ffi (~> 1.0)
 
 PLATFORMS
   ruby

data/lib/veewee/version.rb

@@ -1,3 +1,3 @@
 module Veewee
-  VERSION = "0.1.25"
+  VERSION = "0.1.26"
 end

data/templates/CentOS-5.6-i386/definition.rb

@@ -2,7 +2,7 @@ Veewee::Session.declare({
   :cpu_count => '1', :memory_size=> '384',
   :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :ioapic => 'on', :pae => 'on',
   :os_type_id => 'RedHat',
-  :iso_file => "CentOS-5.5-i386-bin-DVD.iso", :iso_src => "", :iso_md5 => "181142a5845586579d5d4d96e43a4827", :iso_download_timeout => 1000,
+  :iso_file => "CentOS-5.6-i386-bin-DVD.iso", :iso_src => "", :iso_md5 => "181142a5845586579d5d4d96e43a4827", :iso_download_timeout => 1000,
   :iso_download_instructions => "We can not download the ISO , you need to download it yourself and put it in the iso directory\n"+
   "- URL: http://isoredirect.centos.org/centos/5/isos/i386/ ",
   :boot_wait => "10", :boot_cmd_sequence => [

data/templates/{Archlinux-latest → archlinux-i686}/postinstall.sh

@@ -2,6 +2,7 @@
 
 #https://wiki.archlinux.org/index.php/Install_from_Existing_Linux
 
+#ARCH=x86_64
 ARCH=i686
 mkdir /tmp/archlinux
 cd /tmp/archlinux
@@ -42,8 +43,8 @@ sfdisk --force /dev/sda <<EOF
 # partition table of /dev/sda
 unit: sectors
 
-/dev/sda1 : start=     2048, size= 18874368, Id=83
-/dev/sda2 : start= 18876416, size=  2095104, Id=82
+/dev/sda1 : start=     2048, size= 16777216, Id=83
+/dev/sda2 : start= 16779264, size=  3987456, Id=82
 /dev/sda3 : start=        0, size=        0, Id= 0
 /dev/sda4 : start=        0, size=        0, Id= 0
 EOF

data/templates/ubuntu-10.04.2-amd64-netboot/definition.rb

@@ -0,0 +1,23 @@
+Veewee::Session.declare({
+  :cpu_count => '1', :memory_size=> '384', 
+  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
+  :os_type_id => 'Ubuntu_64',
+  :iso_file => "ubuntu-10.04.x-server-amd64-netboot.iso",
+  :iso_src => "http://archive.ubuntu.com/ubuntu/dists/lucid/main/installer-amd64/current/images/netboot/mini.iso",
+  :iso_md5 => "d260ca4ad6d0c81bf5cf38a63fa63b5b",
+  :iso_download_timeout => "1000",
+  :boot_wait => "10", :boot_cmd_sequence => [
+    'linux noapic preseed/url=http://%IP%:%PORT%/preseed.cfg ',
+    'debian-installer=en_US auto locale=en_US kbd-chooser/method=us ',
+    'hostname=%NAME% ',
+    'fb=false debconf/frontend=noninteractive ',
+    'console-setup/ask_detect=false console-setup/modelcode=pc105 console-setup/layoutcode=us ',
+    'initrd=initrd.gz -- <Enter>'
+  ],
+  :kickstart_port => "7122", :kickstart_timeout => "10000", :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 sh '%f'",
+  :shutdown_cmd => "shutdown -P now",
+  :postinstall_files => [ "postinstall.sh"], :postinstall_timeout => "10000"
+})

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

@@ -0,0 +1,87 @@
+# postinstall.sh created from Mitchell's official lucid32/64 baseboxes
+
+# 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
+
+# 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
+
+# Install NFS client
+apt-get -y install nfs-common
+
+# 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
+
+# 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
+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
+
+# 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
+
+# Removing leftover leases and persistent rules
+echo "cleaning up dhcp leases"
+rm /var/lib/dhcp3/*
+
+# Make sure Udev doesn't block our network
+# http://6.ptmc.org/?p=164
+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
+exit

data/templates/ubuntu-10.04.2-amd64-netboot/preseed.cfg

@@ -0,0 +1,89 @@
+## Options to set on the command line
+d-i debian-installer/locale string en_US
+d-i console-setup/ask_detect boolean false
+d-i console-setup/layout string Belgium
+
+#d-i netcfg/get_hostname string dummy
+d-i netcfg/get_hostname string unassigned-hostname
+d-i netcfg/get_domain string unassigned-domain
+
+# Continue without a default route
+# Not working , specify a dummy in the DHCP
+#d-i netcfg/no_default_route boolean
+
+d-i time/zone string Europe/Brussels
+d-i clock-setup/utc-auto boolean true
+d-i clock-setup/utc boolean true
+
+d-i kbd-chooser/method	select	Belgian
+
+d-i netcfg/wireless_wep string
+
+d-i base-installer/kernel/override-image string linux-server
+#d-i base-installer/kernel/override-image string linux-image-2.6.32-21-generic
+
+# Choices: Dialog, Readline, Gnome, Kde, Editor, Noninteractive
+d-i debconf debconf/frontend select Noninteractive
+
+d-i pkgsel/install-language-support boolean false
+tasksel tasksel/first multiselect standard, ubuntu-server
+
+#d-i partman-auto/method string regular
+d-i partman-auto/method string lvm
+#d-i partman-auto/purge_lvm_from_device boolean true
+
+d-i partman-lvm/confirm boolean true
+d-i partman-lvm/device_remove_lvm boolean true
+d-i partman-auto/choose_recipe select atomic
+
+d-i partman/confirm_write_new_label boolean true
+d-i partman/confirm_nooverwrite boolean true
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+
+#http://ubuntu-virginia.ubuntuforums.org/showthread.php?p=9626883
+#Message: "write the changes to disk and configure lvm preseed"
+#http://serverfault.com/questions/189328/ubuntu-kickstart-installation-using-lvm-waits-for-input
+#preseed partman-lvm/confirm_nooverwrite boolean true
+
+# Write the changes to disks and configure LVM?
+d-i partman-lvm/confirm boolean true
+d-i partman-lvm/confirm_nooverwrite boolean true
+d-i partman-auto-lvm/guided_size string max
+
+## Default user, we can get away with a recipe to change this
+d-i passwd/user-fullname string vagrant
+d-i passwd/username string vagrant
+d-i passwd/user-password password vagrant
+d-i passwd/user-password-again password vagrant
+d-i user-setup/encrypt-home boolean false
+d-i user-setup/allow-password-weak boolean true
+
+## minimum is puppet and ssh and ntp
+# Individual additional packages to install
+d-i pkgsel/include string openssh-server  ntp
+
+# Whether to upgrade packages after debootstrap.
+# Allowed values: none, safe-upgrade, full-upgrade
+d-i pkgsel/upgrade select full-upgrade
+
+d-i grub-installer/only_debian boolean true
+d-i grub-installer/with_other_os boolean true
+d-i finish-install/reboot_in_progress note
+
+#For the update
+d-i pkgsel/update-policy select none
+
+# debconf-get-selections --install
+#Use mirror
+#d-i apt-setup/use_mirror boolean true
+#d-i     mirror/country          string manual
+d-i     mirror/country          string US
+
+d-i mirror/protocol	string http
+d-i mirror/country string manual
+d-i mirror/http/hostname	string us.archive.ubuntu.com
+d-i mirror/http/directory	string /ubuntu
+d-i mirror/suite	select lucid
+d-i mirror/http/proxy string
+#d-i debian-installer/allow_unauthenticated	string true

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

@@ -70,4 +70,18 @@ apt-get -y autoremove
 dd if=/dev/zero of=/EMPTY bs=1M
 rm -f /EMPTY
 
-exit
+# Removing leftover leases and persistent rules
+echo "cleaning up dhcp leases"
+rm /var/lib/dhcp3/*
+
+# Make sure Udev doesn't block our network
+# http://6.ptmc.org/?p=164
+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
+exit

data/templates/ubuntu-10.04.2-server-i386-netboot/definition.rb

@@ -0,0 +1,23 @@
+Veewee::Session.declare({
+  :cpu_count => '1', :memory_size=> '384', 
+  :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off',
+  :os_type_id => 'Ubuntu',
+  :iso_file => "ubuntu-10.04.x-server-i386-netboot.iso",
+  :iso_src => "http://archive.ubuntu.com/ubuntu/dists/lucid/main/installer-i386/current/images/netboot/mini.iso",
+  :iso_md5 => "d260ca4ad6d0c81bf5cf38a63fa63b5b",
+  :iso_download_timeout => "1000",
+  :boot_wait => "10", :boot_cmd_sequence => [
+    'linux noapic preseed/url=http://%IP%:%PORT%/preseed.cfg ',
+    'debian-installer=en_US auto locale=en_US kbd-chooser/method=us ',
+    'hostname=%NAME% ',
+    'fb=false debconf/frontend=noninteractive ',
+    'console-setup/ask_detect=false console-setup/modelcode=pc105 console-setup/layoutcode=us ',
+    'initrd=initrd.gz -- <Enter>'
+   ],
+  :kickstart_port => "7122", :kickstart_timeout => "10000", :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 sh '%f'",
+  :shutdown_cmd => "shutdown -P now",
+  :postinstall_files => [ "postinstall.sh"], :postinstall_timeout => "10000"
+})

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

@@ -0,0 +1,87 @@
+# postinstall.sh created from Mitchell's official lucid32/64 baseboxes
+
+# 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
+
+# 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
+
+# Install NFS client
+apt-get -y install nfs-common
+
+# 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
+
+# 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
+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
+
+# 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
+
+# Removing leftover leases and persistent rules
+echo "cleaning up dhcp leases"
+rm /var/lib/dhcp3/*
+
+# Make sure Udev doesn't block our network
+# http://6.ptmc.org/?p=164
+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
+exit

data/templates/ubuntu-10.04.2-server-i386-netboot/preseed.cfg

@@ -0,0 +1,89 @@
+## Options to set on the command line
+d-i debian-installer/locale string en_US
+d-i console-setup/ask_detect boolean false
+d-i console-setup/layout string Belgium
+
+#d-i netcfg/get_hostname string dummy
+d-i netcfg/get_hostname string unassigned-hostname
+d-i netcfg/get_domain string unassigned-domain
+
+# Continue without a default route
+# Not working , specify a dummy in the DHCP
+#d-i netcfg/no_default_route boolean
+
+d-i time/zone string Europe/Brussels
+d-i clock-setup/utc-auto boolean true
+d-i clock-setup/utc boolean true
+
+d-i kbd-chooser/method	select	Belgian
+
+d-i netcfg/wireless_wep string
+
+d-i base-installer/kernel/override-image string linux-server
+#d-i base-installer/kernel/override-image string linux-image-2.6.32-21-generic
+
+# Choices: Dialog, Readline, Gnome, Kde, Editor, Noninteractive
+d-i debconf debconf/frontend select Noninteractive
+
+d-i pkgsel/install-language-support boolean false
+tasksel tasksel/first multiselect standard, ubuntu-server
+
+#d-i partman-auto/method string regular
+d-i partman-auto/method string lvm
+#d-i partman-auto/purge_lvm_from_device boolean true
+
+d-i partman-lvm/confirm boolean true
+d-i partman-lvm/device_remove_lvm boolean true
+d-i partman-auto/choose_recipe select atomic
+
+d-i partman/confirm_write_new_label boolean true
+d-i partman/confirm_nooverwrite boolean true
+d-i partman/choose_partition select finish
+d-i partman/confirm boolean true
+
+#http://ubuntu-virginia.ubuntuforums.org/showthread.php?p=9626883
+#Message: "write the changes to disk and configure lvm preseed"
+#http://serverfault.com/questions/189328/ubuntu-kickstart-installation-using-lvm-waits-for-input
+#preseed partman-lvm/confirm_nooverwrite boolean true
+
+# Write the changes to disks and configure LVM?
+d-i partman-lvm/confirm boolean true
+d-i partman-lvm/confirm_nooverwrite boolean true
+d-i partman-auto-lvm/guided_size string max
+
+## Default user, we can get away with a recipe to change this
+d-i passwd/user-fullname string vagrant
+d-i passwd/username string vagrant
+d-i passwd/user-password password vagrant
+d-i passwd/user-password-again password vagrant
+d-i user-setup/encrypt-home boolean false
+d-i user-setup/allow-password-weak boolean true
+
+## minimum is puppet and ssh and ntp
+# Individual additional packages to install
+d-i pkgsel/include string openssh-server  ntp
+
+# Whether to upgrade packages after debootstrap.
+# Allowed values: none, safe-upgrade, full-upgrade
+d-i pkgsel/upgrade select full-upgrade
+
+d-i grub-installer/only_debian boolean true
+d-i grub-installer/with_other_os boolean true
+d-i finish-install/reboot_in_progress note
+
+#For the update
+d-i pkgsel/update-policy select none
+
+# debconf-get-selections --install
+#Use mirror
+#d-i apt-setup/use_mirror boolean true
+#d-i     mirror/country          string manual
+d-i     mirror/country          string US
+
+d-i mirror/protocol	string http
+d-i mirror/country string manual
+d-i mirror/http/hostname	string us.archive.ubuntu.com
+d-i mirror/http/directory	string /ubuntu
+d-i mirror/suite	select lucid
+d-i mirror/http/proxy string
+#d-i debian-installer/allow_unauthenticated	string true

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

@@ -70,4 +70,19 @@ apt-get -y autoremove
 dd if=/dev/zero of=/EMPTY bs=1M
 rm -f /EMPTY
 
+# Removing leftover leases and persistent rules
+echo "cleaning up dhcp leases"
+rm /var/lib/dhcp3/*
+
+# Make sure Udev doesn't block our network
+# http://6.ptmc.org/?p=164
+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
+exit
 exit

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

@@ -70,4 +70,18 @@ apt-get -y autoremove
 dd if=/dev/zero of=/EMPTY bs=1M
 rm -f /EMPTY
 
-exit
+# Removing leftover leases and persistent rules
+echo "cleaning up dhcp leases"
+rm /var/lib/dhcp3/*
+
+# Make sure Udev doesn't block our network
+# http://6.ptmc.org/?p=164
+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
+exit

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

@@ -70,4 +70,18 @@ apt-get -y autoremove
 dd if=/dev/zero of=/EMPTY bs=1M
 rm -f /EMPTY
 
+# Removing leftover leases and persistent rules
+echo "cleaning up dhcp leases"
+rm /var/lib/dhcp3/*
+
+# Make sure Udev doesn't block our network
+# http://6.ptmc.org/?p=164
+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
 exit

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

@@ -70,4 +70,18 @@ apt-get -y autoremove
 dd if=/dev/zero of=/EMPTY bs=1M
 rm -f /EMPTY
 
-exit
+# Removing leftover leases and persistent rules
+echo "cleaning up dhcp leases"
+rm /var/lib/dhcp3/*
+
+# Make sure Udev doesn't block our network
+# http://6.ptmc.org/?p=164
+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
+exit

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

@@ -70,4 +70,18 @@ apt-get -y autoremove
 dd if=/dev/zero of=/EMPTY bs=1M
 rm -f /EMPTY
 
-exit
+# Removing leftover leases and persistent rules
+echo "cleaning up dhcp leases"
+rm /var/lib/dhcp3/*
+
+# Make sure Udev doesn't block our network
+# http://6.ptmc.org/?p=164
+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
+exit

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

@@ -70,4 +70,18 @@ apt-get -y autoremove
 dd if=/dev/zero of=/EMPTY bs=1M
 rm -f /EMPTY
 
-exit
+# Removing leftover leases and persistent rules
+echo "cleaning up dhcp leases"
+rm /var/lib/dhcp3/*
+
+# Make sure Udev doesn't block our network
+# http://6.ptmc.org/?p=164
+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
+exit

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

@@ -70,4 +70,18 @@ apt-get -y autoremove
 dd if=/dev/zero of=/EMPTY bs=1M
 rm -f /EMPTY
 
-exit
+# Removing leftover leases and persistent rules
+echo "cleaning up dhcp leases"
+rm /var/lib/dhcp3/*
+
+# Make sure Udev doesn't block our network
+# http://6.ptmc.org/?p=164
+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
+exit

data/templates/windows-2008R2-amd64-experimental/cygwin-sshd.bat

@@ -8,7 +8,7 @@ REM goto a temp directory
 cd %SystemDrive%\windows\temp
 
 REM run the installation
-cmd /c a:/setup.exe -q -R %SystemDrive%\cygwin -P openssh,openssl,curl,cygrunsrv,wget,rebase,vim -s http://cygwin.mirrors.pair.com
+cmd /c a:/cygwin-setup.exe -q -R %SystemDrive%\cygwin -P openssh,openssl,curl,cygrunsrv,wget,rebase,vim -s http://cygwin.mirrors.pair.com
 
 %SystemDrive%\cygwin\bin\bash -c 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin cygrunsrv -R sshd'
 

data/veewee.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency "progressbar"
   s.add_dependency "cucumber", "0.8.5"
   s.add_dependency "rspec", "~> 2.5.0"
+  #s.add_dependency "simon", "~> 0.1.1"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: veewee
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: 
   segments: 
   - 0
   - 1
-  - 25
-  version: 0.1.25
+  - 26
+  version: 0.1.26
 platform: ruby
 authors: 
 - Patrick Debois
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 +02:00
+date: 2011-06-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -195,9 +195,6 @@ files:
 - lib/veewee/utils.rb
 - lib/veewee/version.rb
 - lib/veewee/web.rb
-- templates/Archlinux-latest/autorun0
-- templates/Archlinux-latest/definition.rb
-- templates/Archlinux-latest/postinstall.sh
 - templates/CentOS-4.8-i386/definition.rb
 - templates/CentOS-4.8-i386/ks.cfg
 - templates/CentOS-4.8-i386/postinstall.sh
@@ -227,6 +224,9 @@ files:
 - templates/Fedora-14-i386/postinstall.sh
 - templates/Sysrescuecd-2.0.0-experimental/autorun0
 - templates/Sysrescuecd-2.0.0-experimental/definition.rb
+- templates/archlinux-i686/autorun0
+- templates/archlinux-i686/definition.rb
+- templates/archlinux-i686/postinstall.sh
 - templates/freebsd-8.2-experimental/definition.rb
 - templates/freebsd-8.2-experimental/postinstall.sh
 - templates/freebsd-8.2-pcbsd-i386-netboot/definition.rb
@@ -254,9 +254,15 @@ files:
 - templates/solaris-11-express-i386/default.xml
 - templates/solaris-11-express-i386/definition.rb
 - templates/solaris-11-express-i386/postinstall.sh
+- templates/ubuntu-10.04.2-amd64-netboot/definition.rb
+- templates/ubuntu-10.04.2-amd64-netboot/postinstall.sh
+- templates/ubuntu-10.04.2-amd64-netboot/preseed.cfg
 - templates/ubuntu-10.04.2-server-amd64/definition.rb
 - templates/ubuntu-10.04.2-server-amd64/postinstall.sh
 - templates/ubuntu-10.04.2-server-amd64/preseed.cfg
+- templates/ubuntu-10.04.2-server-i386-netboot/definition.rb
+- templates/ubuntu-10.04.2-server-i386-netboot/postinstall.sh
+- templates/ubuntu-10.04.2-server-i386-netboot/preseed.cfg
 - templates/ubuntu-10.04.2-server-i386/definition.rb
 - templates/ubuntu-10.04.2-server-i386/postinstall.sh
 - templates/ubuntu-10.04.2-server-i386/preseed.cfg
@@ -286,7 +292,6 @@ files:
 - templates/windows-2008R2-amd64-experimental/install-winrm.bat
 - templates/windows-2008R2-amd64-experimental/note-virtualbox-additions.txt
 - templates/windows-2008R2-amd64-experimental/postinstall.sh
-- templates/windows-2008R2-amd64-experimental/setup.exe
 - templates/windows-2008R2-amd64-experimental/winrm.rb
 - trials/docu-vbox.txt
 - trials/f.rb